ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 1.86; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.32 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 245that call.
199 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 264 my $msg = join "", @_;
207 265
208 $msg .= "\n" 266 $msg .= "\n"
209 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
210 268
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 270
213 LOG llevError, $msg; 271 LOG llevWarn, $msg;
214 }; 272};
215}
216 273
217$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
219 276
220 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 281 return;#d#
223 }#d# 282 }#d#
224 283
225 # kill coroutine otherwise 284 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 285 Coro::terminate
228}; 286};
229
230$SIG{__DIE__} = sub { }; #d#?
231 287
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 298for my $pkg (qw(
243 cf::global cf::attachable 299 cf::global cf::attachable
244 cf::object cf::object::player 300 cf::object cf::object::player
245 cf::client cf::player 301 cf::client cf::player
246 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
247 cf::map cf::party cf::region 304 cf::party cf::region
248)) { 305)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 307}
252 308
253$EV::DIED = sub { 309$EV::DIED = sub {
254 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
255}; 311};
256 312
257############################################################################# 313#############################################################################
258 314
259=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 353
298sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
300 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
301=item cf::lock_wait $string 371=item cf::lock_wait $string
302 372
303Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
304 374
305=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
306 376
307Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
310returned. 380returned.
311 381
312Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 383deadlocked coro.
319 389
320Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
321 391
322=cut 392=cut
323 393
324our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 395
327sub lock_wait($) { 396sub lock_wait($) {
328 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 398}
341 399
342sub lock_acquire($) { 400sub lock_acquire($) {
343 my ($key) = @_; 401 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 402}
357 403
358sub lock_active($) { 404sub lock_active($) {
359 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 406}
363 407
364sub freeze_mainloop { 408sub freeze_mainloop {
365 tick_inhibit_inc; 409 tick_inhibit_inc;
366 410
367 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
368} 412}
369 413
370=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
371 415
372Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 417get spread over time.
374 418
375=cut 419=cut
376 420
377sub periodic($$) { 421sub periodic($$) {
378 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
395 439
396=cut 440=cut
397 441
398our @SLOT_QUEUE; 442our @SLOT_QUEUE;
399our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
400 445
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
404 449
405 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
406 452
407 while () { 453 while () {
408 next_job: 454 next_job:
455
409 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 457
411 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 462 $job->[2]->send;
415 Coro::cede; 463 Coro::cede;
416 goto next_job; 464 goto next_job;
417 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 467 }
419 } 468 }
420 469
421 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 473 $signal->wait;
425 } else { 474 } else {
475 $busy = 0;
426 Coro::schedule; 476 Coro::schedule;
427 } 477 }
428 } 478 }
429}; 479};
430 480
431sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
432 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
433 485
434 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
435 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
436 489
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
465=cut 518=cut
466 519
467sub sync_job(&) { 520sub sync_job(&) {
468 my ($job) = @_; 521 my ($job) = @_;
469 522
470 if ($Coro::current == $Coro::main) { 523 if (in_main) {
471 my $time = EV::time; 524 my $time = AE::time;
472 525
473 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
475 528
476 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
477 530
478 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
479 532
480 my $busy = 1; 533 my $busy = 1;
481 my @res; 534 my @res;
482 535
483 (async { 536 (async {
484 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 538 @res = eval { $job->() };
486 warn $@ if $@; 539 error $@ if $@;
487 undef $busy; 540 undef $busy;
488 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
489 542
490 while ($busy) { 543 while ($busy) {
491 if (Coro::nready) { 544 if (Coro::nready) {
493 } else { 546 } else {
494 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
495 } 548 }
496 } 549 }
497 550
498 my $time = EV::time - $time; 551 my $time = AE::time - $time;
499 552
500 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
501 554
502 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
503 } else { 556 } else {
549 }, @args; 602 }, @args;
550 603
551 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
552} 605}
553 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
554=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
555 646
556Returns a single value from the environment database. 647Returns a single value from the environment database.
557 648
558=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
566within each server. 657within each server.
567 658
568=cut 659=cut
569 660
570sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
571 my ($name) = @_; 665 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
573 667
574 eval { 668 eval {
575 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
585} 679}
586 680
587our $DB; 681our $DB;
588 682
589sub db_init { 683sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
592 };
593} 685}
594 686
595sub db_get($$) { 687sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
597 689
598 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
599 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
600 694
601 $! ? () 695 $! ? ()
602 : $data 696 : $data
603 }
604} 697}
605 698
606sub db_put($$$) { 699sub db_put($$$) {
607 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
664 757
665 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
666 my $data = $process->(\@data); 759 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
668 761
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 763
671 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
674 767
684 777
685=cut 778=cut
686 779
687sub datalog($@) { 780sub datalog($@) {
688 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 783}
691 784
692=back 785=back
693 786
694=cut 787=cut
695 788
696############################################################################# 789#############################################################################
697 790
698=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
699 792
700Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
703 796
704In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
756 849
757Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
759 852
760Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
762 855
763These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
764 857
765=over 4 858=over 4
889 982
890 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 985
893 } elsif (ref $type) { 986 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
895 988
896 } else { 989 } else {
897 shift @arg; 990 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
899 } 992 }
900 } 993 }
901} 994}
902 995
903sub _object_attach { 996sub _object_attach {
913 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
914 } 1007 }
915 1008
916 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
917 } else { 1010 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1012 }
920 1013
921 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
922} 1015}
923 1016
982 1075
983 for (@$callbacks) { 1076 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
985 1078
986 if ($@) { 1079 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1081 override;
990 } 1082 }
991 1083
992 return 1 if $override; 1084 return 1 if $override;
993 } 1085 }
1056 1148
1057sub reattach { 1149sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1151 my ($obj) = @_;
1060 1152
1153 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1155
1063 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1064 1157
1065 @$registry = (); 1158 @$registry = ();
1066 1159
1071 for (@$attach) { 1164 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1074 } 1167 }
1075 } else { 1168 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1170 }
1078 } 1171 }
1079} 1172}
1080 1173
1081cf::attachable->attach ( 1174cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1109 1202
1110 sync_job { 1203 sync_job {
1111 if (length $$rdata) { 1204 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1115 1209
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1120 close $fh; 1217 aio_close $fh;
1121 1218
1122 if (@$objs) { 1219 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1226 aio_fsync $fh;
1227 }
1128 close $fh; 1228 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1230 }
1131 } else { 1231 } else {
1132 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1133 } 1233 }
1134 1234
1135 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1239 } else {
1137 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1138 } 1241 }
1139 } else { 1242 } else {
1140 aio_unlink $filename; 1243 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1142 } 1245 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1270 $av = $st->{objs};
1168 } 1271 }
1169 1272
1170 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1173 1277
1174 ($data, $av) 1278 ($data, $av)
1175} 1279}
1176 1280
1177=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1233 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1234 1338
1235 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1236} 1340}
1237 1341
1342use File::Glob ();
1343
1238cf::player->attach ( 1344cf::player->attach (
1239 on_command => sub { 1345 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1241 1347
1242 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1243 or return; 1349 or return;
1244 1350
1267 1373
1268 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1269 if $reply; 1375 if $reply;
1270 1376
1271 } else { 1377 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1379 }
1274 1380
1275 cf::override; 1381 cf::override;
1276 }, 1382 },
1277); 1383);
1278 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1279sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1280 cf::sync_job { 1401 cf::sync_job {
1281 my %todo; 1402 my %todo;
1282 1403
1283 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1405 next unless -r $path;
1302 1423
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1426
1306 $ext{source} = 1427 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1309 . $source 1430 . $source
1310 . "\n};\n1"; 1431 . "\n};\n1";
1311 1432
1312 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1313 } 1434 }
1314 1435
1436 my $pass = 0;
1315 my %done; 1437 my %done;
1316 while (%todo) { 1438 while (%todo) {
1317 my $progress; 1439 my $progress;
1318 1440
1441 ++$pass;
1442
1443 ext:
1319 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1446 next ext
1322 unless exists $done{$_}; 1447 unless exists $done{$_};
1323 } 1448 }
1324 1449
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1451
1327 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1330 1457
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1459 if exists $v->{meta}{mandatory};
1335 1460
1336 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1337 } 1470 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1471 }
1343 1472
1344 skip: 1473 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1347 } 1481 }
1348 }; 1482 };
1349} 1483}
1350 1484
1351############################################################################# 1485#############################################################################
1352 1486
1353=back 1487=back
1354 1488
1355=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1356 1490
1357Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1358 1492
1359=cut 1493=cut
1360 1494
1361package cf::player; 1495package cf::player;
1362 1496
1405 1539
1406sub exists($) { 1540sub exists($) {
1407 my ($login) = @_; 1541 my ($login) = @_;
1408 1542
1409 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1411} 1545}
1412 1546
1413sub find($) { 1547sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1549 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1562 or return;
1429 1563
1430 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1431 or return; 1565 or return;
1566
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1435 } 1570 }
1436 } 1571 }
1437} 1572}
1438 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1439sub save($) { 1587sub save($) {
1440 my ($pl) = @_; 1588 my ($pl) = @_;
1441 1589
1442 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1443 1591
1446 1594
1447 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1448 1596
1449 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1604
1452 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1606 cf::cede_to_tick;
1454} 1607}
1455 1608
1487 my ($pl) = @_; 1640 my ($pl) = @_;
1488 1641
1489 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1490 1643
1491 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1646
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1498 1652
1499 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1693
1540 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1541 my $path = path $login; 1695 my $path = path $login;
1542 1696
1543 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1703 }
1549 1704
1553 1708
1554 \@logins 1709 \@logins
1555} 1710}
1556 1711
1557=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1558 1715
1559Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1560player. May block. 1717player. May block.
1561 1718
1562=cut 1719=cut
1580 } 1737 }
1581 1738
1582 \@paths 1739 \@paths
1583} 1740}
1584 1741
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1743
1587Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1745
1678=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1679 1747
1680Sends an ext reply to the player. 1748Sends an ext reply to the player.
1681 1749
1713 1781
1714=cut 1782=cut
1715 1783
1716sub find_by_path($) { 1784sub find_by_path($) {
1717 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1718 1788
1719 my ($match, $specificity); 1789 my ($match, $specificity);
1720 1790
1721 for my $region (list) { 1791 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1750 1820
1751sub generate_random_map { 1821sub generate_random_map {
1752 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1753 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1827 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1776 1849
1777sub register { 1850sub register {
1778 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 1852 my $pkg = caller;
1780 1853
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 1855
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1857}
1786 1858
1787# also paths starting with '/' 1859# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1861
1790sub thawer_merge { 1862sub thawer_merge {
1791 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1792 1864
1793 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1879 1951
1880# the temporary/swap location 1952# the temporary/swap location
1881sub save_path { 1953sub save_path {
1882 my ($self) = @_; 1954 my ($self) = @_;
1883 1955
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1886} 1958}
1887 1959
1888# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1889sub uniq_path { 1961sub uniq_path {
1890 my ($self) = @_; 1962 my ($self) = @_;
1891 1963
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1966}
1904 1967
1905sub decay_objects { 1968sub decay_objects {
1906 my ($self) = @_; 1969 my ($self) = @_;
1907 1970
1991sub find { 2054sub find {
1992 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1993 2056
1994 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1995 2058
1996 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2061
1999 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
2004 or return; 2064 or return;
2005 2065
2006 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
2007 2067
2009 or return; 2069 or return;
2010 2070
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2014 undef $guard1; 2075 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2076 $map->reset;
2017 return find $path; 2077 return find $path;
2018 } 2078 }
2019 2079
2020 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2021 } 2081 }
2022} 2082}
2023 2083
2024sub pre_load { } 2084sub pre_load { }
2025sub post_load { } 2085#sub post_load { } # XS
2026 2086
2027sub load { 2087sub load {
2028 my ($self) = @_; 2088 my ($self) = @_;
2029 2089
2030 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2108 $f->skip_block;
2049 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2050 or return; 2110 or return;
2051 2111
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2053 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2054 2114
2055 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2116 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2136 $self->decay_objects;
2077 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2078 $self->update_buttons; 2138 $self->update_buttons;
2079 cf::cede_to_tick; 2139 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2140 $self->activate;
2083 } 2141 }
2084 2142
2085 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2087 2145
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2147 }
2090 2148
2091 $self->post_load; 2149 $self->post_load;
2092} 2150}
2093 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2094sub customise_for { 2155sub customise_for {
2095 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2096 2157
2097 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2159 if $self->per_player;
2114 or next; 2175 or next;
2115 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2116 or next; 2177 or next;
2117 $neigh->load; 2178 $neigh->load;
2118 2179
2180 # now find the diagonal neighbours
2119 push @neigh, 2181 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 } 2184 }
2123 2185
2130} 2192}
2131 2193
2132sub find_sync { 2194sub find_sync {
2133 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2134 2196
2135 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2136} 2201}
2137 2202
2138sub do_load_sync { 2203sub do_load_sync {
2139 my ($map) = @_; 2204 my ($map) = @_;
2140 2205
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2143 2208
2144 cf::sync_job { $map->load }; 2209 $map->load;
2145} 2210}
2146 2211
2147our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2149 2214
2151 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2152 2217
2153 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2154 2219
2155 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2222 }
2158 2223
2159 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2160 2225
2161 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2176 2241
2177 () 2242 ()
2178} 2243}
2179 2244
2245# common code, used by both ->save and ->swapout
2180sub save { 2246sub _save {
2181 my ($self) = @_; 2247 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2248
2185 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2186 2250
2187 return unless $self->dirty; 2251 return unless $self->dirty;
2188 2252
2197 2261
2198 cf::async { 2262 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2201 }; 2265 };
2266
2267 cf::get_slot 0.02;
2202 2268
2203 if ($uniq) { 2269 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2272 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2274 }
2209} 2275}
2210 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2211sub swap_out { 2285sub swap_out {
2212 my ($self) = @_; 2286 my ($self) = @_;
2213 2287
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2219 return if $self->players; 2292 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2223 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2224 2344
2225 $self->deactivate; 2345 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2347 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2348
2273 $self->unlink_save; 2349 $self->unlink_save;
2274 $self->destroy; 2350 $self->destroy;
2275} 2351}
2276 2352
2284 2360
2285 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2286 2362
2287 $self->unlink_save; 2363 $self->unlink_save;
2288 2364
2289 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2370
2343 2419
2344sub unique_maps() { 2420sub unique_maps() {
2345 [ 2421 [
2346 map { 2422 map {
2347 utf8::decode $_; 2423 utf8::decode $_;
2348 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2349 ? normalise $_ 2427 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2429 ]
2353} 2430}
2354 2431
2355package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2356 2463
2357=back 2464=back
2358 2465
2359=head3 cf::object 2466=head3 cf::object
2360 2467
2364 2471
2365=over 4 2472=over 4
2366 2473
2367=item $ob->inv_recursive 2474=item $ob->inv_recursive
2368 2475
2369Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2370 2478
2371=cut 2479=cut
2372 2480
2373sub inv_recursive_; 2481sub inv_recursive_;
2374sub inv_recursive_ { 2482sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2380} 2488}
2381 2489
2382=item $ref = $ob->ref 2490=item $ref = $ob->ref
2383 2491
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2385 2493
2386=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2387 2495
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2497even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2530dialogue with the given NPC character.
2423 2531
2424=cut 2532=cut
2425 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2426# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2549# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2565
2444 } else { 2566 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2569 }
2448 } 2570 }
2449} 2571}
2450 2572
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2598
2477=item $player_object->enter_link 2599=item $player_object->enter_link
2478 2600
2479Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2480 2602
2481The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2483 2607
2484Will never block. 2608Will never block.
2485 2609
2486=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2487 2611
2507sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2508 my ($self) = @_; 2632 my ($self) = @_;
2509 2633
2510 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2511 2635
2636 ++$self->{_link_recursion};
2637
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2639
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2516 2642
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2644}
2519 2645
2520sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2522 2648
2539 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2541 2667
2542 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2545 2671
2546 $map->load; 2672 $map->load;
2547 $map->load_neighbours; 2673 $map->load_neighbours;
2548 2674
2549 return unless $self->contr->active; 2675 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2676
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2554} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2555 2684
2685}
2686
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2688
2558Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2693be called at the end of this process.
2563 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2564=cut 2698=cut
2565 2699
2566our $GOTOGEN; 2700our $GOTOGEN;
2567 2701
2568sub cf::object::player::goto { 2702sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2570 2710
2571 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2713
2574 $self->enter_link; 2714 $self->enter_link;
2598 my $map = eval { 2738 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2600 2740
2601 if ($map) { 2741 if ($map) {
2602 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2744 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2746 }
2607 2747
2608 $map 2748 $map
2616 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2619 } 2759 }
2620 2760
2621 $done->() if $done; 2761 $done->($self) if $done;
2622 })->prio (1); 2762 })->prio (1);
2623} 2763}
2624 2764
2625=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2626 2766
2646} 2786}
2647 2787
2648sub prepare_random_map { 2788sub prepare_random_map {
2649 my ($exit) = @_; 2789 my ($exit) = @_;
2650 2790
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2793 # that depends on the exit object
2656 2794
2657 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2797 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2664 } 2804 }
2665 2805
2666 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2667 2807
2668 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2671 2811
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2814 undef $fh;
2675 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2676 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2679 } 2823 }
2680} 2824}
2681 2825
2682sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2684 2828
2685 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2686 2830
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2831 $self->enter_link;
2699 2832
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2833 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2706 2835
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2709 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2710 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2711 1; 2857 1
2712 }) { 2858 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2863
2718 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2865 $self->leave_link;
2720 } 2866 }
2721 })->prio (1); 2867 })->prio (1);
2722} 2868}
2723 2869
2735sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2737 2883
2738 utf8::encode $text; 2884 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2740} 2911}
2741 2912
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2914
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2748 2919
2749=cut 2920=cut
2750 2921
2751# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2753 "c/identify" => { 2930 "c/identify" => {
2754 id => "infobox", 2931 id => "infobox",
2755 title => "Identify", 2932 title => "Identify",
2756 reply => undef, 2933 reply => undef,
2757 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2759 "c/examine" => { 2936 "c/examine" => {
2760 id => "infobox", 2937 id => "infobox",
2761 title => "Examine", 2938 title => "Examine",
2762 reply => undef, 2939 reply => undef,
2763 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2947 },
2765 "c/book" => { 2948 "c/book" => {
2766 id => "infobox", 2949 id => "infobox",
2767 title => "Book", 2950 title => "Book",
2768 reply => undef, 2951 reply => undef,
2784 id => "infobox", 2967 id => "infobox",
2785 title => "Body Parts", 2968 title => "Body Parts",
2786 reply => undef, 2969 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2788 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2789 "c/uptime" => { 3008 "c/uptime" => {
2790 id => "infobox", 3009 id => "infobox",
2791 title => "Uptime", 3010 title => "Uptime",
2792 reply => undef, 3011 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3015 id => "infobox",
2797 title => "Map Info", 3016 title => "Map Info",
2798 reply => undef, 3017 reply => undef,
2799 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2800 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2801); 3034);
2802 3035
2803sub cf::client::send_msg { 3036sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3038
2806 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2807 3041
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3043
2810 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2813 3047
2814 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2818 3050
2819 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3056 }
2826 3057
2827 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2828 } 3059 }
2829 3060
2830 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2831 3062
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3063 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2836 3066
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3070 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3071
2851 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3073}
2865 3074
2866=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2867 3076
2868Sends an ext event to the client. 3077Sends an ext event to the client.
2871 3080
2872sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2874 3083
2875 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3089 }
2881} 3090}
2882 3091
2883=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2884 3093
2888 3097
2889sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2891 3100
2892 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3104 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3107 }
2899} 3108}
2900 3109
2901=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2902 3111
2973 3182
2974 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2975 if $reply; 3184 if $reply;
2976 3185
2977 } else { 3186 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3188 }
2980 3189
2981 cf::override; 3190 cf::override;
2982 }, 3191 },
2983); 3192);
3003 3212
3004 $coro 3213 $coro
3005} 3214}
3006 3215
3007cf::client->attach ( 3216cf::client->attach (
3008 on_destroy => sub { 3217 on_client_destroy => sub {
3009 my ($ns) = @_; 3218 my ($ns) = @_;
3010 3219
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3221 },
3013); 3222);
3029our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3030 3239
3031$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3032 3241
3033$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3036 sort time 3245 sort time
3037)); 3246));
3038 3247
3039# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3042 3251
3043The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3044 3253
3045 cf::object 3254 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3048 3258
3049 cf::object::player 3259 cf::object::player
3050 player 3260 player
3051 3261
3052 cf::player 3262 cf::player
3057 3267
3058=cut 3268=cut
3059 3269
3060for ( 3270for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3067) { 3277) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3280 for @funs;
3072} 3281}
3073 3282
3088 3297
3089 my $qcode = $code; 3298 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3092 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3093 local $_; 3305 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3306
3096 my $eval = 3307 my $eval =
3097 "do {\n" 3308 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3311 . $code
3101 . "\n}" 3312 . "\n}"
3102 ; 3313 ;
3103 3314
3315 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3107 3324
3108 if ($@) { 3325 if ($@) {
3109 warn "$@"; 3326 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3112 } 3329 }
3113 3330
3114 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3115} 3332}
3116 3333
3130=cut 3347=cut
3131 3348
3132sub register_script_function { 3349sub register_script_function {
3133 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3134 3351
3135 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3137} 3354}
3138 3355
3139=back 3356=back
3140 3357
3141=cut 3358=cut
3142 3359
3143############################################################################# 3360#############################################################################
3144# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3145 3405
3146sub load_facedata($) { 3406sub load_facedata($) {
3147 my ($path) = @_; 3407 my ($path) = @_;
3148 3408
3149 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?) 3410 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3152 3412
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3414
3155 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3156 3416
3157 my $facedata; 3417 my $facedata;
3158 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3159 or die "$path: $!"; 3419 or die "$path: $!";
3160 3420
3162 3422
3163 $facedata->{version} == 2 3423 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3425
3166 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3429 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3432 };
3171 cf::cede_to_tick; 3433 cf::cede_to_tick;
3172 3434
3173 { 3435 {
3174 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3440
3179 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3445
3184 cf::cede_to_tick; 3446 cf::cede_to_tick;
3185 } 3447 }
3186 3448
3187 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3192 3454
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3458 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3460 }
3199 3461
3200 cf::cede_to_tick; 3462 cf::cede_to_tick;
3201 } 3463 }
3202 } 3464 }
3211 3473
3212 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3213 } 3475 }
3214 3476
3215 { 3477 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3219 3479
3220 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3483
3225 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3240 } else { 3486 } else {
3241 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3242 } 3488 }
3243 3489
3244 cf::cede_to_tick; 3490 cf::cede_to_tick;
3245 } 3491 }
3246 } 3492 }
3247 3493
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3495
3250 1 3496 1
3251} 3497}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3498
3273register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3275 3501
3276 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3278 } 3504 }
3279}; 3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3280 3516
3281sub reload_regions { 3517sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3519 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3298} 3534}
3299 3535
3300sub reload_archetypes { 3536sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3538 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3539}
3309 3540
3310sub reload_treasures { 3541sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3313} 3544}
3314 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3315sub reload_resources { 3569sub reload_resources {
3316 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3317 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3318 reload_regions; 3575 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3576 reload_treasures;
3323 3577
3324 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3579}
3330 3580
3331sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3585 or return;
3334 3586
3335 local $/; 3587 local $/;
3336 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3337 3589
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3591
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3594
3343 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3599 };
3348 warn $@ if $@; 3600 warn $@ if $@;
3349 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3350} 3632}
3351 3633
3352sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3353 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3647 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3360 }; 3651 };
3361 3652
3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3362 reload_config; 3667 reload_config;
3363 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3364 load_extensions; 3678 load_extensions;
3365 3679
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3680 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3681
3368 EV::loop; 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3369} 3698}
3370 3699
3371############################################################################# 3700#############################################################################
3372# initialisation and cleanup 3701# initialisation and cleanup
3373 3702
3374# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3375BEGIN { 3704BEGIN {
3376 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3380 }; 3709 };
3381 } 3710 }
3382} 3711}
3383 3712
3384sub write_runtime { 3713sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3386 3715
3387 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3389 3718
3390 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3720
3392 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3393 3722
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3724 or return;
3396 3725
3397 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3410 3739
3411 close $fh 3740 close $fh
3412 or return; 3741 or return;
3413 3742
3414 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3744 and return;
3416 3745
3417 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3747
3419 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
3420} 3799}
3421 3800
3422sub emergency_save() { 3801sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3424 3803
3425 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3426 3810
3427 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3428 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3820 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3822 $pl->save;
3437 } 3823 }
3438 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3439 3825
3440 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3831 $map->valid or next;
3444 $map->save; 3832 $map->save;
3445 } 3833 }
3446 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3447 3835
3448 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 3864 };
3452 3865
3453 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3454} 3867}
3455 3868
3456sub post_cleanup { 3869sub post_cleanup {
3457 my ($make_core) = @_; 3870 my ($make_core) = @_;
3458 3871
3872 IO::AIO::flush;
3873
3459 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
3461} 3904}
3462 3905
3463sub do_reload_perl() { 3906sub do_reload_perl() {
3464 # can/must only be called in main 3907 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3466 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3467 return; 3910 return;
3468 } 3911 }
3469 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3470 warn "reloading..."; 3918 info "reloading...";
3471 3919
3472 warn "entering sync_job"; 3920 trace "entering sync_job";
3473 3921
3474 cf::sync_job { 3922 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 3923 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 3924
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 3927 %EXT_CORO = ();
3498 3928
3499 warn "removing commands"; 3929 trace "removing commands";
3500 %COMMAND = (); 3930 %COMMAND = ();
3501 3931
3502 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3503 %EXTCMD = (); 3933 %EXTCMD = ();
3504 %EXTICMD = (); 3934 %EXTICMD = ();
3505 3935
3506 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3509 3939
3510 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3511 eval { 3941 eval {
3512 $cb->($pkg); 3942 $cb->($pkg);
3513 1 3943 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3515 } 3949 }
3516 3950
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3954
3525 warn "... unloading $k"; 3955 trace "... unloading $k";
3526 delete $INC{$k}; 3956 delete $INC{$k};
3527 3957
3528 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3530 3960
3531 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3533 } 3966 }
3534 3967
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3971
3542 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3975
3546 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3977 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3549 3979
3550 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3551 3981
3552 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3553 require cf; 3983 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3555 3985
3556 warn "loading config and database again"; 3986 trace "loading config and database again";
3557 cf::reload_config; 3987 cf::reload_config;
3558 3988
3559 warn "loading extensions"; 3989 trace "loading extensions";
3560 cf::load_extensions; 3990 cf::load_extensions;
3561 3991
3992 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3568 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3569 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3570 4005
3571 1 4006 1
3572 } or do { 4007 } or do {
3573 warn $@; 4008 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3575 }; 4014 }
3576 4015
3577 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3578}; 4018};
3579 4019
3580our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3581 4021
3582sub reload_perl() { 4022sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3585 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4030 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
4032 };
3589 }; 4033 };
3590} 4034}
3591 4035
3592register_command "reload" => sub { 4036register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3599 reload_perl; 4043 reload_perl;
3600 }; 4044 };
3601 } 4045 }
3602}; 4046};
3603 4047
3604unshift @INC, $LIBDIR; 4048#############################################################################
3605 4049
3606my $bug_warning = 0; 4050my $bug_warning = 0;
3607 4051
3608our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3610 4054
3611sub wait_for_tick { 4055sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 4057
3615 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 4060 $signal->wait;
3618} 4061}
3619 4062
3620sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 4065
3624 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4068 $signal->wait;
3627} 4069}
3633 return; 4075 return;
3634 } 4076 }
3635 4077
3636 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3637 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4084 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4086 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3644 }; 4088 };
3645 } 4089 }
3646 4090
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4092 $sig->send;
3656 4100
3657 if (0) { 4101 if (0) {
3658 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3662 } 4106 }
3663 } 4107 }
3664} 4108}
3665 4109
3666{ 4110{
3667 # configure BDB 4111 # configure BDB
3668 4112
3669 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3672 4116
3673 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4124
3680 cf::sync_job { 4125 cf::sync_job {
3681 eval { 4126 eval {
3707{ 4152{
3708 # configure IO::AIO 4153 # configure IO::AIO
3709 4154
3710 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4157 undef $AnyEvent::AIO::WATCHER;
3713} 4158}
3714 4159
3715my $_log_backtrace; 4160my $_log_backtrace;
3716 4161
3717sub _log_backtrace { 4162sub _log_backtrace {
3720 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3721 4166
3722 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3725 async { 4171 async {
3726 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3727 4173
3728 my @bt = fork_call { 4174 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4186 }
3741 4187
3742 @funcs 4188 @funcs
3743 }; 4189 };
3744 4190
3745 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4194 --$_log_backtrace;
3748 }; 4195 };
3749 } else { 4196 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4199 }
3753} 4200}
3754 4201
3755# load additional modules 4202# load additional modules
3756use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3757 4205
3758END { cf::emergency_save } 4206END { cf::emergency_save }
3759 4207
37601 42081
3761 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines