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.540 by root, Tue May 4 23:32: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);
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"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1311 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1313 warn $msg; 1460
1314 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1462 delete $todo{$k};
1316 } 1463 } else {
1317 1464 $done{$k} = delete $todo{$k};
1318 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1319 } 1470 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1471 }
1325 1472
1326 skip: 1473 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1329 } 1481 }
1330 }; 1482 };
1331} 1483}
1332 1484
1333############################################################################# 1485#############################################################################
1334 1486
1335=back 1487=back
1336 1488
1337=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1338 1490
1339Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1340 1492
1341=cut 1493=cut
1342 1494
1343package cf::player; 1495package cf::player;
1344 1496
1387 1539
1388sub exists($) { 1540sub exists($) {
1389 my ($login) = @_; 1541 my ($login) = @_;
1390 1542
1391 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1393} 1545}
1394 1546
1395sub find($) { 1547sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1549 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1562 or return;
1411 1563
1412 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1413 or return; 1565 or return;
1566
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1417 } 1570 }
1418 } 1571 }
1419} 1572}
1420 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1421sub save($) { 1587sub save($) {
1422 my ($pl) = @_; 1588 my ($pl) = @_;
1423 1589
1424 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1425 1591
1428 1594
1429 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1430 1596
1431 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1433 1604
1434 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1606 cf::cede_to_tick;
1436} 1607}
1437 1608
1469 my ($pl) = @_; 1640 my ($pl) = @_;
1470 1641
1471 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1472 1643
1473 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1646
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1480 1652
1481 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1693
1522 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1523 my $path = path $login; 1695 my $path = path $login;
1524 1696
1525 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1703 }
1531 1704
1535 1708
1536 \@logins 1709 \@logins
1537} 1710}
1538 1711
1539=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1540 1715
1541Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1542player. May block. 1717player. May block.
1543 1718
1544=cut 1719=cut
1562 } 1737 }
1563 1738
1564 \@paths 1739 \@paths
1565} 1740}
1566 1741
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1743
1569Expand crossfire pod fragments into protocol xml. 1744Expand 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 1745
1660=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1661 1747
1662Sends an ext reply to the player. 1748Sends an ext reply to the player.
1663 1749
1695 1781
1696=cut 1782=cut
1697 1783
1698sub find_by_path($) { 1784sub find_by_path($) {
1699 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1700 1788
1701 my ($match, $specificity); 1789 my ($match, $specificity);
1702 1790
1703 for my $region (list) { 1791 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1732 1820
1733sub generate_random_map { 1821sub generate_random_map {
1734 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1735 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1827 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1849
1759sub register { 1850sub register {
1760 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1852 my $pkg = caller;
1762 1853
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1855
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1857}
1768 1858
1769# also paths starting with '/' 1859# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1861
1772sub thawer_merge { 1862sub thawer_merge {
1773 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1774 1864
1775 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1861 1951
1862# the temporary/swap location 1952# the temporary/swap location
1863sub save_path { 1953sub save_path {
1864 my ($self) = @_; 1954 my ($self) = @_;
1865 1955
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1868} 1958}
1869 1959
1870# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1871sub uniq_path { 1961sub uniq_path {
1872 my ($self) = @_; 1962 my ($self) = @_;
1873 1963
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1965 "$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} 1966}
1886 1967
1887sub decay_objects { 1968sub decay_objects {
1888 my ($self) = @_; 1969 my ($self) = @_;
1889 1970
1973sub find { 2054sub find {
1974 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1975 2056
1976 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1977 2058
1978 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2061
1981 $cf::MAP{$path} || do { 2062 $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 2063 my $map = new_from_path cf::map $path
1986 or return; 2064 or return;
1987 2065
1988 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1989 2067
1991 or return; 2069 or return;
1992 2070
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1996 undef $guard1; 2075 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2076 $map->reset;
1999 return find $path; 2077 return find $path;
2000 } 2078 }
2001 2079
2002 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2003 } 2081 }
2004} 2082}
2005 2083
2006sub pre_load { } 2084sub pre_load { }
2007sub post_load { } 2085#sub post_load { } # XS
2008 2086
2009sub load { 2087sub load {
2010 my ($self) = @_; 2088 my ($self) = @_;
2011 2089
2012 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2108 $f->skip_block;
2031 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2032 or return; 2110 or return;
2033 2111
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2035 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2036 2114
2037 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2116 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2136 $self->decay_objects;
2059 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2060 $self->update_buttons; 2138 $self->update_buttons;
2061 cf::cede_to_tick; 2139 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2140 $self->activate;
2065 } 2141 }
2066 2142
2067 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2069 2145
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2147 }
2072 2148
2073 $self->post_load; 2149 $self->post_load;
2074} 2150}
2075 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2076sub customise_for { 2155sub customise_for {
2077 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2078 2157
2079 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2159 if $self->per_player;
2096 or next; 2175 or next;
2097 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2098 or next; 2177 or next;
2099 $neigh->load; 2178 $neigh->load;
2100 2179
2180 # now find the diagonal neighbours
2101 push @neigh, 2181 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2184 }
2105 2185
2112} 2192}
2113 2193
2114sub find_sync { 2194sub find_sync {
2115 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2116 2196
2117 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2118} 2201}
2119 2202
2120sub do_load_sync { 2203sub do_load_sync {
2121 my ($map) = @_; 2204 my ($map) = @_;
2122 2205
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2125 2208
2126 cf::sync_job { $map->load }; 2209 $map->load;
2127} 2210}
2128 2211
2129our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2131 2214
2133 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2134 2217
2135 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2136 2219
2137 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2222 }
2140 2223
2141 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2142 2225
2143 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2158 2241
2159 () 2242 ()
2160} 2243}
2161 2244
2245# common code, used by both ->save and ->swapout
2162sub save { 2246sub _save {
2163 my ($self) = @_; 2247 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2248
2167 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2168 2250
2169 return unless $self->dirty; 2251 return unless $self->dirty;
2170 2252
2179 2261
2180 cf::async { 2262 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2183 }; 2265 };
2266
2267 cf::get_slot 0.02;
2184 2268
2185 if ($uniq) { 2269 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2272 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2274 }
2191} 2275}
2192 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2193sub swap_out { 2285sub swap_out {
2194 my ($self) = @_; 2286 my ($self) = @_;
2195 2287
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2201 return if $self->players; 2292 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2206 2344
2207 $self->deactivate; 2345 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2347 $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 2348
2255 $self->unlink_save; 2349 $self->unlink_save;
2256 $self->destroy; 2350 $self->destroy;
2257} 2351}
2258 2352
2266 2360
2267 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2268 2362
2269 $self->unlink_save; 2363 $self->unlink_save;
2270 2364
2271 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2370
2325 2419
2326sub unique_maps() { 2420sub unique_maps() {
2327 [ 2421 [
2328 map { 2422 map {
2329 utf8::decode $_; 2423 utf8::decode $_;
2330 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2331 ? normalise $_ 2427 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2429 ]
2335} 2430}
2336 2431
2337package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2338 2463
2339=back 2464=back
2340 2465
2341=head3 cf::object 2466=head3 cf::object
2342 2467
2346 2471
2347=over 4 2472=over 4
2348 2473
2349=item $ob->inv_recursive 2474=item $ob->inv_recursive
2350 2475
2351Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2352 2478
2353=cut 2479=cut
2354 2480
2355sub inv_recursive_; 2481sub inv_recursive_;
2356sub inv_recursive_ { 2482sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2362} 2488}
2363 2489
2364=item $ref = $ob->ref 2490=item $ref = $ob->ref
2365 2491
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2367 2493
2368=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2369 2495
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2497even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2530dialogue with the given NPC character.
2405 2531
2406=cut 2532=cut
2407 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2408# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2549# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2565
2426 } else { 2566 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2569 }
2430 } 2570 }
2431} 2571}
2432 2572
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2598
2459=item $player_object->enter_link 2599=item $player_object->enter_link
2460 2600
2461Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2462 2602
2463The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2465 2607
2466Will never block. 2608Will never block.
2467 2609
2468=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2469 2611
2489sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2490 my ($self) = @_; 2632 my ($self) = @_;
2491 2633
2492 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2493 2635
2636 ++$self->{_link_recursion};
2637
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2639
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2498 2642
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2644}
2501 2645
2502sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2504 2648
2521 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2523 2667
2524 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2527 2671
2528 $map->load; 2672 $map->load;
2529 $map->load_neighbours; 2673 $map->load_neighbours;
2530 2674
2531 return unless $self->contr->active; 2675 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2676
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2536} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2537 2684
2685}
2686
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2539 2688
2540Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2693be called at the end of this process.
2545 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2546=cut 2698=cut
2547 2699
2548our $GOTOGEN; 2700our $GOTOGEN;
2549 2701
2550sub cf::object::player::goto { 2702sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2552 2710
2553 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2713
2556 $self->enter_link; 2714 $self->enter_link;
2580 my $map = eval { 2738 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2582 2740
2583 if ($map) { 2741 if ($map) {
2584 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2744 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2746 }
2589 2747
2590 $map 2748 $map
2598 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2601 } 2759 }
2602 2760
2603 $done->() if $done; 2761 $done->($self) if $done;
2604 })->prio (1); 2762 })->prio (1);
2605} 2763}
2606 2764
2607=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2608 2766
2628} 2786}
2629 2787
2630sub prepare_random_map { 2788sub prepare_random_map {
2631 my ($exit) = @_; 2789 my ($exit) = @_;
2632 2790
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2793 # that depends on the exit object
2638 2794
2639 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2797 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2646 } 2804 }
2647 2805
2648 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2649 2807
2650 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2653 2811
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2814 undef $fh;
2657 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2658 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2661 } 2823 }
2662} 2824}
2663 2825
2664sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2666 2828
2667 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2668 2830
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; 2831 $self->enter_link;
2681 2832
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 { 2833 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2688 2835
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2691 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2692 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2693 1; 2857 1
2694 }) { 2858 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2863
2700 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 2865 $self->leave_link;
2702 } 2866 }
2703 })->prio (1); 2867 })->prio (1);
2704} 2868}
2705 2869
2717sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2719 2883
2720 utf8::encode $text; 2884 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2722} 2911}
2723 2912
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2914
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2730 2919
2731=cut 2920=cut
2732 2921
2733# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2735 "c/identify" => { 2930 "c/identify" => {
2736 id => "infobox", 2931 id => "infobox",
2737 title => "Identify", 2932 title => "Identify",
2738 reply => undef, 2933 reply => undef,
2739 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2741 "c/examine" => { 2936 "c/examine" => {
2742 id => "infobox", 2937 id => "infobox",
2743 title => "Examine", 2938 title => "Examine",
2744 reply => undef, 2939 reply => undef,
2745 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2947 },
2747 "c/book" => { 2948 "c/book" => {
2748 id => "infobox", 2949 id => "infobox",
2749 title => "Book", 2950 title => "Book",
2750 reply => undef, 2951 reply => undef,
2766 id => "infobox", 2967 id => "infobox",
2767 title => "Body Parts", 2968 title => "Body Parts",
2768 reply => undef, 2969 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2770 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2771 "c/uptime" => { 3008 "c/uptime" => {
2772 id => "infobox", 3009 id => "infobox",
2773 title => "Uptime", 3010 title => "Uptime",
2774 reply => undef, 3011 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3015 id => "infobox",
2779 title => "Map Info", 3016 title => "Map Info",
2780 reply => undef, 3017 reply => undef,
2781 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2782 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2783); 3034);
2784 3035
2785sub cf::client::send_msg { 3036sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3038
2788 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2789 3041
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3043
2792 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2795 3047
2796 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2800 3050
2801 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3056 }
2808 3057
2809 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2810 } 3059 }
2811 3060
2812 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2813 3062
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3063 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2818 3066
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3070 );
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 3071
2833 $color &= cf::NDI_COLOR_MASK; 3072 $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} 3073}
2847 3074
2848=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2849 3076
2850Sends an ext event to the client. 3077Sends an ext event to the client.
2853 3080
2854sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2856 3083
2857 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3089 }
2863} 3090}
2864 3091
2865=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2866 3093
2870 3097
2871sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2873 3100
2874 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3104 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3107 }
2881} 3108}
2882 3109
2883=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2884 3111
2955 3182
2956 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2957 if $reply; 3184 if $reply;
2958 3185
2959 } else { 3186 } else {
2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2961 } 3188 }
2962 3189
2963 cf::override; 3190 cf::override;
2964 }, 3191 },
2965); 3192);
2985 3212
2986 $coro 3213 $coro
2987} 3214}
2988 3215
2989cf::client->attach ( 3216cf::client->attach (
2990 on_destroy => sub { 3217 on_client_destroy => sub {
2991 my ($ns) = @_; 3218 my ($ns) = @_;
2992 3219
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3221 },
2995); 3222);
3011our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3012 3239
3013$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3014 3241
3015$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3018 sort time 3245 sort time
3019)); 3246));
3020 3247
3021# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3024 3251
3025The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3026 3253
3027 cf::object 3254 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3030 3258
3031 cf::object::player 3259 cf::object::player
3032 player 3260 player
3033 3261
3034 cf::player 3262 cf::player
3039 3267
3040=cut 3268=cut
3041 3269
3042for ( 3270for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3049) { 3277) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3280 for @funs;
3054} 3281}
3055 3282
3070 3297
3071 my $qcode = $code; 3298 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3074 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3075 local $_; 3305 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3306
3078 my $eval = 3307 my $eval =
3079 "do {\n" 3308 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3311 . $code
3083 . "\n}" 3312 . "\n}"
3084 ; 3313 ;
3085 3314
3315 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3089 3324
3090 if ($@) { 3325 if ($@) {
3091 warn "$@"; 3326 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3094 } 3329 }
3095 3330
3096 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3097} 3332}
3098 3333
3112=cut 3347=cut
3113 3348
3114sub register_script_function { 3349sub register_script_function {
3115 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3116 3351
3117 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3119} 3354}
3120 3355
3121=back 3356=back
3122 3357
3123=cut 3358=cut
3124 3359
3125############################################################################# 3360#############################################################################
3126# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3127 3405
3128sub load_facedata($) { 3406sub load_facedata($) {
3129 my ($path) = @_; 3407 my ($path) = @_;
3130 3408
3131 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3132 # for this (global event?) 3410 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3134 3412
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3414
3137 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3138 3416
3139 my $facedata; 3417 my $facedata;
3140 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3141 or die "$path: $!"; 3419 or die "$path: $!";
3142 3420
3144 3422
3145 $facedata->{version} == 2 3423 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3425
3148 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3429 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3432 };
3153 cf::cede_to_tick; 3433 cf::cede_to_tick;
3154 3434
3155 { 3435 {
3156 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3440
3161 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3445
3166 cf::cede_to_tick; 3446 cf::cede_to_tick;
3167 } 3447 }
3168 3448
3169 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3174 3454
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3458 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3460 }
3181 3461
3182 cf::cede_to_tick; 3462 cf::cede_to_tick;
3183 } 3463 }
3184 } 3464 }
3193 3473
3194 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3195 } 3475 }
3196 3476
3197 { 3477 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3201 3479
3202 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3483
3207 if ($info->{type} & 1) { 3484 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}; 3485 cf::face::set_type $idx, $info->{type};
3222 } else { 3486 } else {
3223 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3224 } 3488 }
3225 3489
3226 cf::cede_to_tick; 3490 cf::cede_to_tick;
3227 } 3491 }
3228 } 3492 }
3229 3493
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3495
3232 1 3496 1
3233} 3497}
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 3498
3255register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3257 3501
3258 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3260 } 3504 }
3261}; 3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3262 3516
3263sub reload_regions { 3517sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3519 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3280} 3534}
3281 3535
3282sub reload_archetypes { 3536sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3538 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} 3539}
3291 3540
3292sub reload_treasures { 3541sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3295} 3544}
3296 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3297sub reload_resources { 3569sub reload_resources {
3298 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3299 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3300 reload_regions; 3575 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3576 reload_treasures;
3305 3577
3306 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3579}
3312 3580
3313sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3585 or return;
3316 3586
3317 local $/; 3587 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3319 3589
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3591
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 3594
3325 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3328 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3329 }; 3599 };
3330 warn $@ if $@; 3600 warn $@ if $@;
3331 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3332} 3632}
3333 3633
3334sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3335 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3647 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3342 }; 3651 };
3343 3652
3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3344 reload_config; 3667 reload_config;
3345 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3346 load_extensions; 3678 load_extensions;
3347 3679
3348 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3681
3350 EV::loop; 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3351} 3698}
3352 3699
3353############################################################################# 3700#############################################################################
3354# initialisation and cleanup 3701# initialisation and cleanup
3355 3702
3356# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3357BEGIN { 3704BEGIN {
3358 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3362 }; 3709 };
3363 } 3710 }
3364} 3711}
3365 3712
3366sub write_runtime { 3713sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3368 3715
3369 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3371 3718
3372 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3720
3374 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3375 3722
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3724 or return;
3378 3725
3379 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3392 3739
3393 close $fh 3740 close $fh
3394 or return; 3741 or return;
3395 3742
3396 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3744 and return;
3398 3745
3399 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3747
3401 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
3402} 3799}
3403 3800
3404sub emergency_save() { 3801sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3406 3803
3407 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3408 3810
3409 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3410 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3820 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3822 $pl->save;
3419 } 3823 }
3420 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3421 3825
3422 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3831 $map->valid or next;
3426 $map->save; 3832 $map->save;
3427 } 3833 }
3428 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3429 3835
3430 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3433 }; 3864 };
3434 3865
3435 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3436} 3867}
3437 3868
3438sub post_cleanup { 3869sub post_cleanup {
3439 my ($make_core) = @_; 3870 my ($make_core) = @_;
3440 3871
3872 IO::AIO::flush;
3873
3441 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
3443} 3904}
3444 3905
3445sub do_reload_perl() { 3906sub do_reload_perl() {
3446 # can/must only be called in main 3907 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3448 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3449 return; 3910 return;
3450 } 3911 }
3451 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3452 warn "reloading..."; 3918 info "reloading...";
3453 3919
3454 warn "entering sync_job"; 3920 trace "entering sync_job";
3455 3921
3456 cf::sync_job { 3922 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 3923 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 3924
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"; 3925 trace "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 3927 %EXT_CORO = ();
3480 3928
3481 warn "removing commands"; 3929 trace "removing commands";
3482 %COMMAND = (); 3930 %COMMAND = ();
3483 3931
3484 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3485 %EXTCMD = (); 3933 %EXTCMD = ();
3486 %EXTICMD = (); 3934 %EXTICMD = ();
3487 3935
3488 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3491 3939
3492 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3493 eval { 3941 eval {
3494 $cb->($pkg); 3942 $cb->($pkg);
3495 1 3943 1
3496 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3497 } 3949 }
3498 3950
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3954
3507 warn "... unloading $k"; 3955 trace "... unloading $k";
3508 delete $INC{$k}; 3956 delete $INC{$k};
3509 3957
3510 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3512 3960
3513 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3515 } 3966 }
3516 3967
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3971
3524 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3975
3528 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3977 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3531 3979
3532 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3533 3981
3534 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3535 require cf; 3983 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3537 3985
3538 warn "loading config and database again"; 3986 trace "loading config and database again";
3539 cf::reload_config; 3987 cf::reload_config;
3540 3988
3541 warn "loading extensions"; 3989 trace "loading extensions";
3542 cf::load_extensions; 3990 cf::load_extensions;
3543 3991
3992 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3550 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3551 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3552 4005
3553 1 4006 1
3554 } or do { 4007 } or do {
3555 warn $@; 4008 error $@;
3556 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3557 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3558 }; 4014 }
3559 4015
3560 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3561}; 4018};
3562 4019
3563our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3564 4021
3565sub reload_perl() { 4022sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3568 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4030 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4032 };
3572 }; 4033 };
3573} 4034}
3574 4035
3575register_command "reload" => sub { 4036register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3582 reload_perl; 4043 reload_perl;
3583 }; 4044 };
3584 } 4045 }
3585}; 4046};
3586 4047
3587unshift @INC, $LIBDIR; 4048#############################################################################
3588 4049
3589my $bug_warning = 0; 4050my $bug_warning = 0;
3590 4051
3591our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3593 4054
3594sub wait_for_tick { 4055sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4057
3598 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 4060 $signal->wait;
3601} 4061}
3602 4062
3603sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 4065
3607 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4068 $signal->wait;
3610} 4069}
3611 4070
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4071sub tick {
3613 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4073 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3616 return; 4075 return;
3617 } 4076 }
3618 4077
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3622 4079
3623 $RUNTIME += $TICK; 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4081
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 4084 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4086 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3632 }; 4088 };
3633 } 4089 }
3634 4090
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4092 $sig->send;
3637 } 4093 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4095 $sig->send;
3640 } 4096 }
3641 4097
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4100
3645 _post_tick; 4101 if (0) {
3646}; 4102 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
4107 }
4108}
3648 4109
3649{ 4110{
3650 # configure BDB 4111 # configure BDB
3651 4112
3652 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3655 4116
3656 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4124
3663 cf::sync_job { 4125 cf::sync_job {
3664 eval { 4126 eval {
3690{ 4152{
3691 # configure IO::AIO 4153 # configure IO::AIO
3692 4154
3693 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4157 undef $AnyEvent::AIO::WATCHER;
3696} 4158}
3697 4159
3698my $_log_backtrace; 4160my $_log_backtrace;
3699 4161
3700sub _log_backtrace { 4162sub _log_backtrace {
3703 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3704 4166
3705 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3708 async { 4171 async {
3709 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3710 4173
3711 my @bt = fork_call { 4174 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4186 }
3724 4187
3725 @funcs 4188 @funcs
3726 }; 4189 };
3727 4190
3728 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4194 --$_log_backtrace;
3731 }; 4195 };
3732 } else { 4196 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4199 }
3736} 4200}
3737 4201
3738# load additional modules 4202# load additional modules
3739use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3740 4205
3741END { cf::emergency_save } 4206END { cf::emergency_save }
3742 4207
37431 42081
3744 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines