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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines