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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 2.01 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42 42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
45 45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
78our $NEXT_TICK; 78our $NEXT_TICK;
79our $NOW; 79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
81 81
82our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 86our $DB_ENV;
84 87
85our %CFG; 88our %CFG;
86 89
87our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 91our $RUNTIME;
89 92
90our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
93 96
94# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 99
157 160
158The raw value load value from the last tick. 161The raw value load value from the last tick.
159 162
160=item %cf::CFG 163=item %cf::CFG
161 164
162Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 166from wherever your confdir points to.
164 167
165=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
166 169
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 171returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 172per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 173
174=item @cf::INVOKE_RESULTS
175
176This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call.
179
171=back 180=back
172 181
173=cut 182=cut
174 183
175BEGIN { 184BEGIN {
179 $msg .= "\n" 188 $msg .= "\n"
180 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
181 190
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 192
184 utf8::encode $msg;
185 LOG llevError, $msg; 193 LOG llevError, $msg;
186 }; 194 };
187} 195}
188 196
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205)) { 213)) {
206 no strict 'refs'; 214 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 216}
209 217
210$Event::DIED = sub { 218$EV::DIED = sub {
211 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
212}; 220};
213 221
214############################################################################# 222#############################################################################
215 223
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 247 $d
240 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
241} 249}
242 250
243=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
250 258
251=cut 259=cut
252 260
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 262
255sub to_json ($) { $json_coder->encode ($_[0]) } 263sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 264sub decode_json($) { $json_coder->decode ($_[0]) }
257 265
258=item cf::lock_wait $string 266=item cf::lock_wait $string
259 267
260Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
261 269
264Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
274Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
275 286
276=cut 287=cut
277 288
278our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
279 291
280sub lock_wait($) { 292sub lock_wait($) {
281 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
282 299
283 # wait for lock, if any 300 # wait for lock, if any
284 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 303 Coro::schedule;
292 309
293 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
294 lock_wait $key; 311 lock_wait $key;
295 312
296 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
297 315
298 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
301 } 320 }
302} 321}
303 322
315 }; 334 };
316 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
317 $guard 336 $guard
318} 337}
319 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
354=item cf::get_slot $time[, $priority[, $name]]
355
356Allocate $time seconds of blocking CPU time at priority C<$priority>:
357This call blocks and returns only when you have at least C<$time> seconds
358of cpu time till the next tick. The slot is only valid till the next cede.
359
360The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class.
362
363Useful for short background jobs.
364
365=cut
366
367our @SLOT_QUEUE;
368our $SLOT_QUEUE;
369
370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
374 my $signal = new Coro::Signal;
375
376 while () {
377 next_job:
378 my $avail = cf::till_tick;
379 if ($avail > 0.01) {
380 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) {
382 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send;
384 Coro::cede;
385 goto next_job;
386 }
387 }
388 }
389
390 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else {
395 Coro::schedule;
396 }
397 }
398};
399
400sub get_slot($;$$) {
401 my ($time, $pri, $name) = @_;
402
403 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal;
405
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready;
409 $sig->wait;
410}
411
320=item cf::async { BLOCK } 412=item cf::async { BLOCK }
321 413
322Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 415C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
327 419
328BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
329 421
330=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
331 423
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 427acceptable.
336 428
337If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
343 435
344sub sync_job(&) { 436sub sync_job(&) {
345 my ($job) = @_; 437 my ($job) = @_;
346 438
347 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 440 my $time = EV::time;
349 441
350 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
352 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
353 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 448 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
356 450
357 my $busy = 1; 451 my $busy = 1;
358 my @res; 452 my @res;
359 453
360 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 456 @res = eval { $job->() };
362 warn $@ if $@; 457 warn $@ if $@;
363 undef $busy; 458 undef $busy;
364 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
365 460
366 while ($busy) { 461 while ($busy) {
367 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
368 } 466 }
467 }
369 468
370 $time = Event::time - $time; 469 $time = EV::time - $time;
371 470
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 473
375 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 504=item fork_call { }, $args
406 505
407Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
411 510
412=cut 511=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 512
423sub fork_call(&@) { 513sub fork_call(&@) {
424 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
425 515
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 516 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 517 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 518 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 519
431 if (my $pid = fork) { 520 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 521 reset_signals;
445 local $SIG{__WARN__}; 522 &$cb
446 local $SIG{__DIE__}; 523 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 524
453 eval { 525 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 526}
466 527
467=item $value = cf::db_get $family => $key 528=item $value = cf::db_get $family => $key
468 529
469Returns a single value from the environment database. 530Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
472 533
473Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
476=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
477 560
478our $DB; 561our $DB;
479 562
480sub db_init { 563sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 564 cf::sync_job {
485 eval { 565 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 566 };
495} 567}
496 568
497sub db_get($$) { 569sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
499 571
549 if (1) { 621 if (1) {
550 $md5 = 622 $md5 =
551 join "\x00", 623 join "\x00",
552 $processversion, 624 $processversion,
553 map { 625 map {
554 Coro::cede; 626 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 628 } 0.. $#$src;
557 629
558 630
559 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
603attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
605 677
606In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
607C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
608Crossfire TRT). 680Deliantra).
609 681
610=over 4 682=over 4
611 683
612=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
613 685
865 "; 937 ";
866 die if $@; 938 die if $@;
867} 939}
868 940
869our $override; 941our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 942our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 943
872sub override { 944sub override {
873 $override = 1; 945 $override = 1;
874 @invoke_results = (); 946 @INVOKE_RESULTS = (@_);
875} 947}
876 948
877sub do_invoke { 949sub do_invoke {
878 my $event = shift; 950 my $event = shift;
879 my $callbacks = shift; 951 my $callbacks = shift;
880 952
881 @invoke_results = (); 953 @INVOKE_RESULTS = ();
882 954
883 local $override; 955 local $override;
884 956
885 for (@$callbacks) { 957 for (@$callbacks) {
886 eval { &{$_->[1]} }; 958 eval { &{$_->[1]} };
903 975
904Generate an object-specific event with the given arguments. 976Generate an object-specific event with the given arguments.
905 977
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 978This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 979removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 980results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 981
910=back 982=back
911 983
912=cut 984=cut
913 985
914############################################################################# 986#############################################################################
915# object support 987# object support
988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
1022sub _can_merge {
1023 my ($ob1, $ob2) = @_;
1024
1025 ++$SLOW_MERGES;#d#
1026
1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
1029}
916 1030
917sub reattach { 1031sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1033 my ($obj) = @_;
920 1034
941cf::attachable->attach ( 1055cf::attachable->attach (
942 prio => -1000000, 1056 prio => -1000000,
943 on_instantiate => sub { 1057 on_instantiate => sub {
944 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
945 1059
946 $data = from_json $data; 1060 $data = decode_json $data;
947 1061
948 for (@$data) { 1062 for (@$data) {
949 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
950 1064
951 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1081sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
969 1083
970 sync_job { 1084 sync_job {
971 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
974 1089
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1094 close $fh;
980 1095
981 if (@$objs) { 1096 if (@$objs) {
982 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1102 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
989 } 1104 }
997 } 1112 }
998 } else { 1113 } else {
999 aio_unlink $filename; 1114 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1001 } 1116 }
1002 } 1117 };
1003} 1118}
1004 1119
1005sub object_freezer_as_string { 1120sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1007 1122
1019 or return; 1134 or return;
1020 1135
1021 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1138 or return;
1139
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1025 } 1142 }
1026 1143
1144 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1029 return ($data, $av); 1148 ($data, $av)
1030} 1149}
1031 1150
1032=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1033 1152
1034=over 4 1153=over 4
1107 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
1108 1227
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1229
1111 if (ref $msg) { 1230 if (ref $msg) {
1231 my ($type, $reply, @payload) =
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235
1236 my @reply;
1237
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1117 } else { 1245 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1247 }
1120 1248
1121 cf::override; 1249 cf::override;
1211 1339
1212=head3 cf::player 1340=head3 cf::player
1213 1341
1214=over 4 1342=over 4
1215 1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1357
1216=item cf::player::find $login 1358=item cf::player::find $login
1217 1359
1218Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1219 1361
1220=cut 1362=cut
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1401
1260 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1263 } 1410 }
1264 } 1411 }
1265} 1412}
1266 1413
1276 1423
1277 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1279 1426
1280 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1281 Coro::cede; 1428 cf::cede_to_tick;
1282} 1429}
1283 1430
1284sub new($) { 1431sub new($) {
1285 my ($login) = @_; 1432 my ($login) = @_;
1286 1433
1290 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1291 1438
1292 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1293 1440
1294 $self 1441 $self
1442}
1443
1444=item $player->send_msg ($channel, $msg, $color, [extra...])
1445
1446=cut
1447
1448sub send_msg {
1449 my $ns = shift->ns
1450 or return;
1451 $ns->send_msg (@_);
1295} 1452}
1296 1453
1297=item $pl->quit_character 1454=item $pl->quit_character
1298 1455
1299Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1511 or return [];
1355 1512
1356 my @logins; 1513 my @logins;
1357 1514
1358 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1362 1524
1363 utf8::decode $login; 1525 utf8::decode $login;
1364 push @logins, $login; 1526 push @logins, $login;
1365 } 1527 }
1366 1528
1399 1561
1400Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1401 1563
1402=cut 1564=cut
1403 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1404sub expand_cfpod { 1577sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1406 1579
1407 # escape & and < 1580 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1581
1411 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1412 1585
1413 1 while 1586 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1591 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1420 $self->gender ? $2 : $1 1593 (?:
1421 }ge 1594 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1595 | < $interior >
1423 || s{H<([^\>]*)>} 1596 )
1597 >
1598 %gcsx
1424 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1619 "")
1428 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1430 1631
1632 for ($xml) {
1431 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1433 1635
1434 # compress some whitespace 1636 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1439 1642
1440 $_ 1643 $xml
1441} 1644}
1645
1646no re 'eval';
1442 1647
1443sub hintmode { 1648sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1650 $_[0]{hintmode}
1446} 1651}
1447 1652
1448=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1449 1654
1450Sends an ext reply to the player. 1655Sends an ext reply to the player.
1451 1656
1452=cut 1657=cut
1453 1658
1454sub ext_reply($$%) { 1659sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1456 1661
1457 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1663}
1460 1664
1461=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1462 1666
1463Sends an ext event to the client. 1667Sends an ext event to the client.
1464 1668
1465=cut 1669=cut
1466 1670
1467sub ext_event($$%) { 1671sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1469 1673
1470 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1471} 1675}
1472 1676
1473=head3 cf::region 1677=head3 cf::region
1474 1678
1475=over 4 1679=over 4
1488 my ($path) = @_; 1692 my ($path) = @_;
1489 1693
1490 my ($match, $specificity); 1694 my ($match, $specificity);
1491 1695
1492 for my $region (list) { 1696 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1697 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1698 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1699 if $region->specificity > $specificity;
1496 } 1700 }
1497 } 1701 }
1498 1702
1618 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1619 return $self; 1823 return $self;
1620 } 1824 }
1621 } 1825 }
1622 1826
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1828 ()
1625} 1829}
1626 1830
1627sub init { 1831sub init {
1628 my ($self) = @_; 1832 my ($self) = @_;
1691 1895
1692sub load_header_from($) { 1896sub load_header_from($) {
1693 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1694 1898
1695 utf8::encode $path; 1899 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1701 1908
1702 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1703 1910
1704 1 1911 1
1705} 1912}
1759sub find { 1966sub find {
1760 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1761 1968
1762 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1763 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1765 1973
1766 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1767 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1768 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1769 or return; 1979 or return;
1770 1980
1771 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1772 1982
1774 or return; 1984 or return;
1775 1985
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1779 $map->reset; 1991 $map->reset;
1780 undef $guard;
1781 return find $path; 1992 return find $path;
1782 } 1993 }
1783 1994
1784 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1785 } 1996 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1795 2006
1796 my $path = $self->{path}; 2007 my $path = $self->{path};
1797 2008
1798 { 2009 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1800 2011
2012 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 2014
1803 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1804 2016
1805 $self->alloc; 2017 $self->alloc;
1806 2018
1807 $self->pre_load; 2019 $self->pre_load;
1808 Coro::cede; 2020 cf::cede_to_tick;
1809 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1811 or return; 2025 or return;
1812 2026
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1815 2029
1816 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2031 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2034 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1821 } 2038 }
1822 } 2039 }
1823 2040
1824 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1825 # now do the right thing for maps 2044 # now do the right thing for maps
1826 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2047 unless $self->difficulty;
1829 Coro::cede; 2048 cf::cede_to_tick;
1830 2049
1831 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2051 $self->decay_objects;
1833 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1834 $self->update_buttons; 2053 $self->update_buttons;
1835 Coro::cede; 2054 cf::cede_to_tick;
1836 $self->set_darkness_map; 2055 $self->set_darkness_map;
1837 Coro::cede; 2056 cf::cede_to_tick;
1838 $self->activate; 2057 $self->activate;
1839 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1840 2062
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 2064 }
1843 2065
1844 $self->post_load; 2066 $self->post_load;
1855 2077
1856 $self 2078 $self
1857} 2079}
1858 2080
1859# find and load all maps in the 3x3 area around a map 2081# find and load all maps in the 3x3 area around a map
1860sub load_diag { 2082sub load_neighbours {
1861 my ($map) = @_; 2083 my ($map) = @_;
1862 2084
1863 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1864 2086
1865 for (0 .. 3) { 2087 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1867 or next; 2089 or next;
1868 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1869 or next; 2091 or next;
1870 $neigh->load; 2092 $neigh->load;
1871 2093
2094 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2097 }
1875 2098
1876 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1878 or next; 2102 or next;
1879 $neigh->load; 2103 $neigh->load;
1880 } 2104 }
1881} 2105}
1882 2106
1887} 2111}
1888 2112
1889sub do_load_sync { 2113sub do_load_sync {
1890 my ($map) = @_; 2114 my ($map) = @_;
1891 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1892 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1893} 2120}
1894 2121
1895our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1897 2124
1898sub find_async { 2125sub find_async {
1899 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1900 2127
1901 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1902 2129
1903 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2132 }
1906 2133
1907 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1908 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1909 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2141 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2142 $map->load if $v;
2143 }
1914 2144
1915 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1916 } 2146 }
1917 } 2147 }
1918 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1919 }; 2149 };
1920 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1923} 2153}
1924 2154
1925sub save { 2155sub save {
1926 my ($self) = @_; 2156 my ($self) = @_;
1927 2157
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2159
1930 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1931 2161
1932 return unless $self->dirty; 2162 return unless $self->dirty;
1933 2163
1939 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1940 2170
1941 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1942 2172
1943 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1945 }; 2176 };
1946 2177
1947 if ($uniq) { 2178 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 my ($self) = @_; 2187 my ($self) = @_;
1957 2188
1958 # save first because save cedes 2189 # save first because save cedes
1959 $self->save; 2190 $self->save;
1960 2191
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2193
1963 return if $self->players; 2194 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1966 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2202 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2203}
1970 2204
1971sub reset_at { 2205sub reset_at {
1972 my ($self) = @_; 2206 my ($self) = @_;
1973 2207
2005 if $uniq; 2239 if $uniq;
2006 } 2240 }
2007 2241
2008 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
2009 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2246 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2247
2014 $self->unlink_save; 2248 $self->unlink_save;
2015 $self->destroy; 2249 $self->destroy;
2016} 2250}
2017 2251
2018my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
2019 2253
2020sub nuke { 2254sub nuke {
2021 my ($self) = @_; 2255 my ($self) = @_;
2022 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
2023 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
2024 2261
2025 $self->unlink_save; 2262 $self->unlink_save;
2026 2263
2027 bless $self, "cf::map"; 2264 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2269
2033 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
2034 2272
2035 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2036} 2274}
2037 2275
2038=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2114 2352
2115sub inv_recursive { 2353sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2117} 2355}
2118 2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
2383}
2384
2119package cf; 2385package cf;
2120 2386
2121=back 2387=back
2122 2388
2123=head3 cf::object::player 2389=head3 cf::object::player
2145 2411
2146 } else { 2412 } else {
2147 my $pl = $self->contr; 2413 my $pl = $self->contr;
2148 2414
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2418
2158 } else { 2419 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2161 } 2422 }
2162 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
2163} 2434}
2164 2435
2165=item $player_object->may ("access") 2436=item $player_object->may ("access")
2166 2437
2167Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2246 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2249 2520
2250 $map->load; 2521 $map->load;
2251 $map->load_diag; 2522 $map->load_neighbours;
2252 2523
2253 return unless $self->contr->active; 2524 return unless $self->contr->active;
2254 $self->activate_recursive; 2525 $self->activate_recursive;
2255 2526
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2258} 2529}
2259 2530
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2532
2262Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2536the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process.
2266 2538
2267=cut 2539=cut
2268 2540
2269our $GOTOGEN; 2541our $GOTOGEN;
2270 2542
2271sub cf::object::player::goto { 2543sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2544 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2545
2274 # do generation counting so two concurrent goto's will be executed in-order 2546 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2548
2277 $self->enter_link; 2549 $self->enter_link;
2278 2550
2279 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2280 my $map = eval { 2573 my $map = eval {
2281 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2282 2575
2283 if ($map) { 2576 if ($map) {
2284 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2286 } else { 2579 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2288 } 2581 }
2289 2582
2290 $map 2583 $map
2291 }; 2584 };
2292 2585
2297 2590
2298 if ($gen == $self->{_goto_generation}) { 2591 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2592 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2593 $self->leave_link ($map, $x, $y);
2301 } 2594 }
2595
2596 $done->() if $done;
2302 })->prio (1); 2597 })->prio (1);
2303} 2598}
2304 2599
2305=item $player_object->enter_exit ($exit_object) 2600=item $player_object->enter_exit ($exit_object)
2306 2601
2343 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2344 } 2639 }
2345 2640
2346 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2347 2642
2348 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2349 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2351 2646
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2380 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2383 2678
2384 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2385 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2386 unless (eval { 2683 unless (eval {
2387 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2388 2685
2389 1; 2686 1;
2415 2712
2416 utf8::encode $text; 2713 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2715}
2419 2716
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2717=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2718
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2719Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2720client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2426 2723
2427=cut 2724=cut
2428 2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2429sub cf::client::send_msg { 2778sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2780
2432 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2433 2782
2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2794 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800 }
2801
2802 $channel = $channel->{id};
2803 }
2804
2434 return unless @extra || length $msg; 2805 return unless @extra || length $msg;
2435 2806
2436 if ($self->can_msg) { 2807 if ($self->can_msg) {
2808 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF;
2811
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438 } else { 2814 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825
2826 $color &= cf::NDI_COLOR_MASK;
2827
2828 utf8::encode $msg;
2829
2450 if (0 && $msg =~ /\[/) { 2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2833 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2835 $self->send_packet ("drawinfo $color $msg")
2455 } 2836 }
2456 } 2837 }
2457 } 2838 }
2458} 2839}
2459 2840
2460=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2461 2842
2462Sends an ext event to the client. 2843Sends an ext event to the client.
2463 2844
2464=cut 2845=cut
2465 2846
2466sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2468 2849
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2471} 2874}
2472 2875
2473=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2474 2877
2475Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2933 my ($ns, $buf) = @_;
2531 2934
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2936
2534 if (ref $msg) { 2937 if (ref $msg) {
2938 my ($type, $reply, @payload) =
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942
2943 my @reply;
2944
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2945 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2946 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2541 } else { 2952 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 2954 }
2544 2955
2545 cf::override; 2956 cf::override;
2592our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2594 3005
2595$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2596 3007
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3008$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math
3010 grepstart grepwhile mapstart mapwhile
3011 sort time
3012));
2598 3013
2599# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2600 3015
2601=pod 3016=pod
2602 3017
2603The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2604 3019
2605 cf::object 3020 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3022 insert remove name archname title slaying race decrease_ob_nr
2608 3023
2609 cf::object::player 3024 cf::object::player
2610 player 3025 player
2611 3026
2612 cf::player 3027 cf::player
2617 3032
2618=cut 3033=cut
2619 3034
2620for ( 3035for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race
2622 insert remove)], 3038 decrease_ob_nr destroy)],
2623 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2626) { 3042) {
2627 no strict 'refs'; 3043 no strict 'refs';
2703# the server's init and main functions 3119# the server's init and main functions
2704 3120
2705sub load_facedata($) { 3121sub load_facedata($) {
2706 my ($path) = @_; 3122 my ($path) = @_;
2707 3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129
2708 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2709 3131
2710 my $facedata; 3132 my $facedata;
2711 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 3134 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2715 3137
2716 $facedata->{version} == 2 3138 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 3140
3141 # patch in the exptable
3142 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3145 };
3146 cf::cede_to_tick;
3147
2719 { 3148 {
2720 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2721 3150
2722 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3153 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3157
3158 cf::cede_to_tick;
2728 } 3159 }
2729 3160
2730 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3162 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 3163 my $idx = cf::face::find $face
2733 or next; 3164 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3165 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3168 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3169 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3170 }
2739 Coro::cede; 3171
3172 cf::cede_to_tick;
2740 } 3173 }
2741 } 3174 }
2742 3175
2743 { 3176 {
2744 my $anims = $facedata->{animinfo}; 3177 my $anims = $facedata->{animinfo};
2745 3178
2746 while (my ($anim, $info) = each %$anims) { 3179 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3180 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3181 cf::cede_to_tick;
2749 } 3182 }
2750 3183
2751 cf::anim::invalidate_all; # d'oh 3184 cf::anim::invalidate_all; # d'oh
2752 } 3185 }
2753 3186
3187 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource};
3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197
3198 if ($info->{type} & 1) {
3199 # prepend meta info
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else {
3208 $data = $info->{data};
3209 }
3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick;
3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 }
3235
2754 1 3236 1
2755} 3237}
2756 3238
3239register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_;
3241
3242 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v);
3244 }
3245};
3246
2757sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2758 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
3254
3255 for (cf::region::list) {
3256 $_->{match} = qr/$_->{match}/
3257 if exists $_->{match};
3258 }
2760} 3259}
2761 3260
2762sub reload_facedata { 3261sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3262 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3263 or die "unable to load facedata\n";
2793 3292
2794sub init { 3293sub init {
2795 reload_resources; 3294 reload_resources;
2796} 3295}
2797 3296
2798sub cfg_load { 3297sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3299 or return;
2801 3300
2802 local $/; 3301 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2819sub main { 3318sub main {
2820 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2822 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823 (async { 3322 (async {
2824 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2826 }; 3326 };
2827 3327
2828 cfg_load; 3328 reload_config;
2829 db_init; 3329 db_init;
2830 load_extensions; 3330 load_extensions;
2831 3331
2832 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2833 Event::loop; 3334 EV::loop;
2834} 3335}
2835 3336
2836############################################################################# 3337#############################################################################
2837# initialisation and cleanup 3338# initialisation and cleanup
2838 3339
2839# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2840BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2849 },
2850 ); 3346 };
2851 } 3347 }
2852} 3348}
2853 3349
2854sub write_runtime { 3350sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
2900 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
2902 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3402 $pl->save;
2906 } 3403 }
2907 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
2908 3405
2909 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
2948 warn "syncing database to disk"; 3445 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3447
2951 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
2952 3449
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
2959 for (;;) { 3451 for (;;) {
2960 BDB::flush; 3452 BDB::flush;
2961 IO::AIO::flush; 3453 IO::AIO::flush;
2962 Coro::cede; 3454 Coro::cede_notself;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
2964 warn "iterate..."; 3456 warn "iterate...";
2965 } 3457 }
2966 3458
2967 ++$RELOAD; 3459 ++$RELOAD;
3026 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
3027 require cf; 3519 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3521
3030 warn "loading config and database again"; 3522 warn "loading config and database again";
3031 cf::cfg_load; 3523 cf::reload_config;
3032 3524
3033 warn "loading extensions"; 3525 warn "loading extensions";
3034 cf::load_extensions; 3526 cf::load_extensions;
3035 3527
3036 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
3056 3548
3057sub reload_perl() { 3549sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3060 3552
3061 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3068 }, 3555 do_reload_perl;
3069 ); 3556 };
3070} 3557}
3071 3558
3072register_command "reload" => sub { 3559register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3074 3561
3075 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3566 reload_perl;
3567 };
3078 } 3568 }
3079}; 3569};
3080 3570
3081unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3082 3572
3101 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3593 $signal->wait;
3104} 3594}
3105 3595
3106 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3117 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3118 return; 3600 return;
3119 } 3601 }
3120 3602
3121 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3122 3604
3123 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3124 3606
3125 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3126 for(1..10) { 3608 $NEXT_TICK += $TICK;
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130 3609
3131 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3132 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3133 $map->alloc; 3612 Coro::async_pool {
3134 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
3135 my $t = Event::time - $t; 3614 write_runtime
3136 3615 or warn "ERROR: unable to write runtime file: $!";
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3616 };
3617 }
3147 3618
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3620 $sig->send;
3164 } 3621 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3623 $sig->send;
3167 } 3624 }
3168 3625
3169 $NOW = Event::time;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3628
3180 _post_tick; 3629 _post_tick;
3181 3630};
3182 3631$TICK_WATCHER->priority (EV::MAXPRI);
3183 },
3184);
3185 3632
3186{ 3633{
3634 BDB::min_parallel 8;
3187 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3188 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8;
3197 3637
3198 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3199 my $status; 3639 my $status;
3200 my $current = $Coro::current; 3640 my $current = $Coro::current;
3201 ( 3641 (
3210 ) 3650 )
3211 }; 3651 };
3212 3652
3213 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3214 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215 3659
3216 cf::sync_job { 3660 cf::sync_job {
3217 eval { 3661 eval {
3218 BDB::db_env_open 3662 BDB::db_env_open
3219 $DB_ENV, 3663 $DB_ENV,
3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3667 0666;
3224 3668
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3670 };
3230 3671
3231 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3673 };
3233 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3234} 3685}
3235 3686
3236{ 3687{
3237 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3238 3689
3239 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 3693}
3250 3694
3251my $_log_backtrace; 3695my $_log_backtrace;
3252 3696
3253sub _log_backtrace { 3697sub _log_backtrace {
3257 3701
3258 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 3704 ++$_log_backtrace;
3261 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3262 my @bt = fork_call { 3708 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines