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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 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 1.86;
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.32 ();
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 43
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 45
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 47
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
74 72
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 74our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 77our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
82 79
83our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 84our $DB_ENV;
85 85
86our %CFG; 86our %CFG;
87 87
88our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 89our $RUNTIME;
90our $NOW;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
158 159
159The raw value load value from the last tick. 160The raw value load value from the last tick.
160 161
161=item %cf::CFG 162=item %cf::CFG
162 163
163Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 165from wherever your confdir points to.
165 166
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
195 210
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 227)) {
213 no strict 'refs'; 228 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 230}
216 231
217$Event::DIED = sub { 232$EV::DIED = sub {
218 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
219}; 234};
220 235
221############################################################################# 236#############################################################################
222 237
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 261 $d
247 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
248} 263}
249 264
250=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
251 266
252Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
253 268
254=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
255 270
256Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
257 272
258=cut 273=cut
259 274
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 276
262sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
264 279
265=item cf::lock_wait $string 280=item cf::lock_wait $string
266 281
267Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
268 283
271Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
274returned. 289returned.
275 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
276Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
278 296
279=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
280 298
281Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
282 300
283=cut 301=cut
284 302
285our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
286 305
287sub lock_wait($) { 306sub lock_wait($) {
288 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
289 313
290 # wait for lock, if any 314 # wait for lock, if any
291 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 317 Coro::schedule;
299 323
300 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
301 lock_wait $key; 325 lock_wait $key;
302 326
303 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
304 329
305 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
308 } 334 }
309} 335}
310 336
322 }; 348 };
323 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
324 $guard 350 $guard
325} 351}
326 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
327=item cf::get_slot $time[, $priority] 368=item cf::get_slot $time[, $priority[, $name]]
328 369
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
332 373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
333Useful for short background jobs. 377Useful for short background jobs.
334 378
335=cut 379=cut
336 380
337our @SLOT_QUEUE; 381our @SLOT_QUEUE;
338our $SLOT_QUEUE; 382our $SLOT_QUEUE;
339 383
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
342 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
343 389
344 while () { 390 while () {
345 next_job: 391 next_job:
346 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
354 } 400 }
355 } 401 }
356 } 402 }
357 403
358 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 407 $signal->wait;
362 } else { 408 } else {
363 Coro::schedule; 409 Coro::schedule;
364 } 410 }
365 } 411 }
366}; 412};
367 413
368sub get_slot($;$) { 414sub get_slot($;$$) {
369 my ($time, $pri) = @_; 415 my ($time, $pri, $name) = @_;
370 416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 422 $SLOT_QUEUE->ready;
374 $sig->wait; 423 $sig->wait;
375} 424}
376 425
384 433
385BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
386 435
387=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
388 437
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable. 441acceptable.
393 442
394If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
395the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
400 449
401sub sync_job(&) { 450sub sync_job(&) {
402 my ($job) = @_; 451 my ($job) = @_;
403 452
404 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 454 my $time = EV::time;
406 455
407 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
409 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
410 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 462 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
413 464
414 my $busy = 1; 465 my $busy = 1;
415 my @res; 466 my @res;
416 467
417 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 470 @res = eval { $job->() };
419 warn $@ if $@; 471 warn $@ if $@;
420 undef $busy; 472 undef $busy;
421 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
422 474
423 while ($busy) { 475 while ($busy) {
424 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
425 } 480 }
481 }
426 482
427 $time = Event::time - $time; 483 $time = EV::time - $time;
428 484
429 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431 487
432 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
462=item fork_call { }, $args 518=item fork_call { }, $args
463 519
464Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
468 524
469=cut 525=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 526
480sub fork_call(&@) { 527sub fork_call(&@) {
481 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
482 529
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 533
488 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 535 reset_signals;
502 local $SIG{__WARN__}; 536 &$cb
503 local $SIG{__DIE__}; 537 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 538
510 eval { 539 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 540}
523 541
524=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
525 543
526Returns a single value from the environment database. 544Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
529 547
530Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
533=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
534 574
535our $DB; 575our $DB;
536 576
537sub db_init { 577sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 578 cf::sync_job {
542 eval { 579 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 580 };
552} 581}
553 582
554sub db_get($$) { 583sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
556 585
606 if (1) { 635 if (1) {
607 $md5 = 636 $md5 =
608 join "\x00", 637 join "\x00",
609 $processversion, 638 $processversion,
610 map { 639 map {
611 Coro::cede; 640 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 642 } 0.. $#$src;
614 643
615 644
616 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
660attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
662 691
663In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
664C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
665Crossfire TRT). 694Deliantra).
666 695
667=over 4 696=over 4
668 697
669=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
670 699
952 } 981 }
953 982
954 0 983 0
955} 984}
956 985
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 987
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 989
961Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
962 991
968 997
969=cut 998=cut
970 999
971############################################################################# 1000#############################################################################
972# object support 1001# object support
973#
974 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
975sub _can_merge { 1036sub _can_merge {
976 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
977 1038
978 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1040
982 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
983} 1043}
984 1044
985sub reattach { 1045sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1047 my ($obj) = @_;
1009cf::attachable->attach ( 1069cf::attachable->attach (
1010 prio => -1000000, 1070 prio => -1000000,
1011 on_instantiate => sub { 1071 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1013 1073
1014 $data = from_json $data; 1074 $data = decode_json $data;
1015 1075
1016 for (@$data) { 1076 for (@$data) {
1017 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1018 1078
1019 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1095sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1037 1097
1038 sync_job { 1098 sync_job {
1039 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1042 1103
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1108 close $fh;
1048 1109
1049 if (@$objs) { 1110 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1116 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1118 }
1065 } 1126 }
1066 } else { 1127 } else {
1067 aio_unlink $filename; 1128 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1069 } 1130 }
1070 } 1131 };
1071} 1132}
1072 1133
1073sub object_freezer_as_string { 1134sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1075 1136
1087 or return; 1148 or return;
1088 1149
1089 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1152 or return;
1153
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1093 } 1156 }
1094 1157
1158 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1097 return ($data, $av); 1162 ($data, $av)
1098} 1163}
1099 1164
1100=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1101 1166
1102=over 4 1167=over 4
1175 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1176 1241
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1243
1179 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1185 } else { 1259 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1261 }
1188 1262
1189 cf::override; 1263 cf::override;
1279 1353
1280=head3 cf::player 1354=head3 cf::player
1281 1355
1282=over 4 1356=over 4
1283 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1284=item cf::player::find $login 1372=item cf::player::find $login
1285 1373
1286Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1287 1375
1288=cut 1376=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1415
1328 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1331 } 1424 }
1332 } 1425 }
1333} 1426}
1334 1427
1344 1437
1345 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1347 1440
1348 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1349 Coro::cede; 1442 cf::cede_to_tick;
1350} 1443}
1351 1444
1352sub new($) { 1445sub new($) {
1353 my ($login) = @_; 1446 my ($login) = @_;
1354 1447
1358 $self->{deny_save} = 1; 1451 $self->{deny_save} = 1;
1359 1452
1360 $cf::PLAYER{$login} = $self; 1453 $cf::PLAYER{$login} = $self;
1361 1454
1362 $self 1455 $self
1456}
1457
1458=item $player->send_msg ($channel, $msg, $color, [extra...])
1459
1460=cut
1461
1462sub send_msg {
1463 my $ns = shift->ns
1464 or return;
1465 $ns->send_msg (@_);
1363} 1466}
1364 1467
1365=item $pl->quit_character 1468=item $pl->quit_character
1366 1469
1367Nukes the player without looking back. If logged in, the connection will 1470Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1525 or return [];
1423 1526
1424 my @logins; 1527 my @logins;
1425 1528
1426 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1430 1538
1431 utf8::decode $login; 1539 utf8::decode $login;
1432 push @logins, $login; 1540 push @logins, $login;
1433 } 1541 }
1434 1542
1467 1575
1468Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1469 1577
1470=cut 1578=cut
1471 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1472sub expand_cfpod { 1591sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1474 1593
1475 # escape & and < 1594 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1595
1479 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1480 1599
1481 1 while 1600 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1605 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1488 $self->gender ? $2 : $1 1607 (?:
1489 }ge 1608 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1609 | < $interior >
1491 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1492 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1633 "")
1496 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1498 1645
1646 for ($xml) {
1499 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1501 1649
1502 # compress some whitespace 1650 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1507 1656
1508 $_ 1657 $xml
1509} 1658}
1659
1660no re 'eval';
1510 1661
1511sub hintmode { 1662sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1664 $_[0]{hintmode}
1514} 1665}
1515 1666
1516=item $player->ext_reply ($msgid, %msg) 1667=item $player->ext_reply ($msgid, @msg)
1517 1668
1518Sends an ext reply to the player. 1669Sends an ext reply to the player.
1519 1670
1520=cut 1671=cut
1521 1672
1522sub ext_reply($$%) { 1673sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1674 my ($self, $id, @msg) = @_;
1524 1675
1525 $msg{msgid} = $id; 1676 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1677}
1528 1678
1529=item $player->ext_event ($type, %msg) 1679=item $player->ext_msg ($type, @msg)
1530 1680
1531Sends an ext event to the client. 1681Sends an ext event to the client.
1532 1682
1533=cut 1683=cut
1534 1684
1535sub ext_event($$%) { 1685sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1686 my ($self, $type, @msg) = @_;
1537 1687
1538 $self->ns->ext_event ($type, %msg); 1688 $self->ns->ext_msg ($type, @msg);
1539} 1689}
1540 1690
1541=head3 cf::region 1691=head3 cf::region
1542 1692
1543=over 4 1693=over 4
1759 1909
1760sub load_header_from($) { 1910sub load_header_from($) {
1761 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1762 1912
1763 utf8::encode $path; 1913 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1769 1922
1770 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1771 1924
1772 1 1925 1
1773} 1926}
1827sub find { 1980sub find {
1828 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1829 1982
1830 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1831 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1833 1987
1834 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1836 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1837 or return; 1993 or return;
1838 1994
1839 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1840 1996
1842 or return; 1998 or return;
1843 1999
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1847 $map->reset; 2005 $map->reset;
1848 undef $guard;
1849 return find $path; 2006 return find $path;
1850 } 2007 }
1851 2008
1852 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1853 } 2010 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1863 2020
1864 my $path = $self->{path}; 2021 my $path = $self->{path};
1865 2022
1866 { 2023 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1868 2025
2026 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2028
1871 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1872 2030
1873 $self->alloc; 2031 $self->alloc;
1874 2032
1875 $self->pre_load; 2033 $self->pre_load;
1876 Coro::cede; 2034 cf::cede_to_tick;
1877 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1879 or return; 2039 or return;
1880 2040
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1883 2043
1884 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2045 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2048 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1889 } 2052 }
1890 } 2053 }
1891 2054
1892 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1893 # now do the right thing for maps 2058 # now do the right thing for maps
1894 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2061 unless $self->difficulty;
1897 Coro::cede; 2062 cf::cede_to_tick;
1898 2063
1899 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2065 $self->decay_objects;
1901 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1902 $self->update_buttons; 2067 $self->update_buttons;
1903 Coro::cede; 2068 cf::cede_to_tick;
1904 $self->set_darkness_map; 2069 $self->set_darkness_map;
1905 Coro::cede; 2070 cf::cede_to_tick;
1906 $self->activate; 2071 $self->activate;
1907 } 2072 }
2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
1908 2076
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 2078 }
1911 2079
1912 $self->post_load; 2080 $self->post_load;
1923 2091
1924 $self 2092 $self
1925} 2093}
1926 2094
1927# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2096sub load_neighbours {
1929 my ($map) = @_; 2097 my ($map) = @_;
1930 2098
1931 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1932 2100
1933 for (0 .. 3) { 2101 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1935 or next; 2103 or next;
1936 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1937 or next; 2105 or next;
1938 $neigh->load; 2106 $neigh->load;
1939 2107
2108 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2111 }
1943 2112
1944 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1946 or next; 2116 or next;
1947 $neigh->load; 2117 $neigh->load;
1948 } 2118 }
1949} 2119}
1950 2120
1955} 2125}
1956 2126
1957sub do_load_sync { 2127sub do_load_sync {
1958 my ($map) = @_; 2128 my ($map) = @_;
1959 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1960 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1961} 2134}
1962 2135
1963our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1965 2138
1966sub find_async { 2139sub find_async {
1967 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1968 2141
1969 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1970 2143
1971 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2146 }
1974 2147
1975 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1976 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1977 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2155 if (my $map = find $k) {
1980 $map->load; 2156 $map->load if $v;
1981 } 2157 }
1982 2158
1983 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1984 } 2160 }
1985 } 2161 }
1986 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1987 }; 2163 };
1988 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1991} 2167}
1992 2168
1993sub save { 2169sub save {
1994 my ($self) = @_; 2170 my ($self) = @_;
1995 2171
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2173
1998 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1999 2175
2000 return unless $self->dirty; 2176 return unless $self->dirty;
2001 2177
2007 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2008 2184
2009 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2010 2186
2011 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2013 }; 2190 };
2014 2191
2015 if ($uniq) { 2192 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2201 my ($self) = @_;
2025 2202
2026 # save first because save cedes 2203 # save first because save cedes
2027 $self->save; 2204 $self->save;
2028 2205
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2207
2031 return if $self->players; 2208 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2034 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2216 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2217}
2038 2218
2039sub reset_at { 2219sub reset_at {
2040 my ($self) = @_; 2220 my ($self) = @_;
2041 2221
2073 if $uniq; 2253 if $uniq;
2074 } 2254 }
2075 2255
2076 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2077 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2260 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2261
2082 $self->unlink_save; 2262 $self->unlink_save;
2083 $self->destroy; 2263 $self->destroy;
2084} 2264}
2085 2265
2086my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2087 2267
2088sub nuke { 2268sub nuke {
2089 my ($self) = @_; 2269 my ($self) = @_;
2090 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2091 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2092 2275
2093 $self->unlink_save; 2276 $self->unlink_save;
2094 2277
2095 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2283
2101 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2102 2286
2103 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2104} 2288}
2105 2289
2106=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2182 2366
2183sub inv_recursive { 2367sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2185} 2369}
2186 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2187package cf; 2399package cf;
2188 2400
2189=back 2401=back
2190 2402
2191=head3 cf::object::player 2403=head3 cf::object::player
2213 2425
2214 } else { 2426 } else {
2215 my $pl = $self->contr; 2427 my $pl = $self->contr;
2216 2428
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2429 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2430 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2432
2226 } else { 2433 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2434 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2435 $self->message ($msg, $flags);
2229 } 2436 }
2230 } 2437 }
2438}
2439
2440=item $object->send_msg ($channel, $msg, $color, [extra...])
2441
2442=cut
2443
2444sub cf::object::send_msg {
2445 my $pl = shift->contr
2446 or return;
2447 $pl->send_msg (@_);
2231} 2448}
2232 2449
2233=item $player_object->may ("access") 2450=item $player_object->may ("access")
2234 2451
2235Returns wether the given player is authorized to access resource "access" 2452Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2317 2534
2318 $map->load; 2535 $map->load;
2319 $map->load_diag; 2536 $map->load_neighbours;
2320 2537
2321 return unless $self->contr->active; 2538 return unless $self->contr->active;
2322 $self->activate_recursive; 2539 $self->activate_recursive;
2323 2540
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2562
2346 $self->enter_link; 2563 $self->enter_link;
2347 2564
2348 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2349 my $map = eval { 2587 my $map = eval {
2350 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2351 2589
2352 if ($map) { 2590 if ($map) {
2353 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2355 } else { 2593 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2595 }
2358 2596
2359 $map 2597 $map
2360 }; 2598 };
2361 2599
2414 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2415 } 2653 }
2416 2654
2417 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2418 2656
2419 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2420 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2422 2660
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2454 2692
2455 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2456 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2697 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2459 2699
2460 1; 2700 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2497 2737
2498=cut 2738=cut
2499 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2500sub cf::client::send_msg { 2792sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2794
2503 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2504 2796
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2507 if (ref $channel) { 2808 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2512 } 2814 }
2513 2815
2514 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2515 } 2817 }
2516 2818
2517 return unless @extra || length $msg; 2819 return unless @extra || length $msg;
2518 2820
2519 if ($self->can_msg) { 2821 if ($self->can_msg) {
2822 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF;
2825
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2826 $self->send_packet ("msg " . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2828 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839
2840 $color &= cf::NDI_COLOR_MASK;
2841
2842 utf8::encode $msg;
2843
2533 if (0 && $msg =~ /\[/) { 2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2847 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2849 $self->send_packet ("drawinfo $color $msg")
2538 } 2850 }
2539 } 2851 }
2540 } 2852 }
2541} 2853}
2542 2854
2543=item $client->ext_event ($type, %msg) 2855=item $client->ext_msg ($type, @msg)
2544 2856
2545Sends an ext event to the client. 2857Sends an ext event to the client.
2546 2858
2547=cut 2859=cut
2548 2860
2549sub cf::client::ext_event($$%) { 2861sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2862 my ($self, $type, @msg) = @_;
2551 2863
2552 return unless $self->extcmd; 2864 if ($self->extcmd == 2) {
2553 2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2867 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2556} 2888}
2557 2889
2558=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2559 2891
2560Queues a query to the client, calling the given callback with 2892Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2947 my ($ns, $buf) = @_;
2616 2948
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2949 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2950
2619 if (ref $msg) { 2951 if (ref $msg) {
2952 my ($type, $reply, @payload) =
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956
2957 my @reply;
2958
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2959 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2960 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2626 } else { 2966 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2968 }
2629 2969
2630 cf::override; 2970 cf::override;
2677our $safe = new Safe "safe"; 3017our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3018our $safe_hole = new Safe::Hole;
2679 3019
2680$SIG{FPE} = 'IGNORE'; 3020$SIG{FPE} = 'IGNORE';
2681 3021
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3022$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math
3024 grepstart grepwhile mapstart mapwhile
3025 sort time
3026));
2683 3027
2684# here we export the classes and methods available to script code 3028# here we export the classes and methods available to script code
2685 3029
2686=pod 3030=pod
2687 3031
2688The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2689 3033
2690 cf::object 3034 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3036 insert remove name archname title slaying race decrease_ob_nr
2693 3037
2694 cf::object::player 3038 cf::object::player
2695 player 3039 player
2696 3040
2697 cf::player 3041 cf::player
2702 3046
2703=cut 3047=cut
2704 3048
2705for ( 3049for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race
2707 insert remove)], 3052 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2711) { 3056) {
2712 no strict 'refs'; 3057 no strict 'refs';
2788# the server's init and main functions 3133# the server's init and main functions
2789 3134
2790sub load_facedata($) { 3135sub load_facedata($) {
2791 my ($path) = @_; 3136 my ($path) = @_;
2792 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143
2793 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2794 3145
2795 my $facedata; 3146 my $facedata;
2796 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3148 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2800 3151
2801 $facedata->{version} == 2 3152 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2804 { 3162 {
2805 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2806 3164
2807 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2809 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3172
2814 cf::cede_to_tick; 3173 cf::cede_to_tick;
2815 } 3174 }
2816 3175
2817 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2819 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2820 or next; 3180 or next;
3181
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3185 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3203
2843 { 3204 {
2844 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3208
2849 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3210 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
2857 3213
2858 if ($name =~ /\.jpg$/) { 3214 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3215 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2861 } else { 3229 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3230 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3231 }
2868 3232
2869 cf::cede_to_tick; 3233 cf::cede_to_tick;
2870 } 3234 }
2871 } 3235 }
2872 3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238
2873 1 3239 1
2874} 3240}
2875 3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261
3262register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_;
3264
3265 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v);
3267 }
3268};
3269
2876sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2877 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
2879 3277
2880 for (cf::region::list) { 3278 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3279 $_->{match} = qr/$_->{match}/
2917 3315
2918sub init { 3316sub init {
2919 reload_resources; 3317 reload_resources;
2920} 3318}
2921 3319
2922sub cfg_load { 3320sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3322 or return;
2925 3323
2926 local $/; 3324 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2928 3326
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3328
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2943sub main { 3341sub main {
2944 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3345 (async {
2948 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
2950 }; 3349 };
2951 3350
2952 cfg_load; 3351 reload_config;
2953 db_init; 3352 db_init;
2954 load_extensions; 3353 load_extensions;
2955 3354
2956 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2957 Event::loop; 3357 EV::loop;
2958} 3358}
2959 3359
2960############################################################################# 3360#############################################################################
2961# initialisation and cleanup 3361# initialisation and cleanup
2962 3362
2963# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
2964BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
2973 },
2974 ); 3369 };
2975 } 3370 }
2976} 3371}
2977 3372
2978sub write_runtime { 3373sub write_runtime {
2979 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
3024 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3425 $pl->save;
3030 } 3426 }
3031 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3032 3428
3033 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
3072 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3470
3075 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3076 3472
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3083 for (;;) { 3474 for (;;) {
3084 BDB::flush; 3475 BDB::flush;
3085 IO::AIO::flush; 3476 IO::AIO::flush;
3086 Coro::cede; 3477 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3479 warn "iterate...";
3089 } 3480 }
3090 3481
3091 ++$RELOAD; 3482 ++$RELOAD;
3150 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
3151 require cf; 3542 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3544
3154 warn "loading config and database again"; 3545 warn "loading config and database again";
3155 cf::cfg_load; 3546 cf::reload_config;
3156 3547
3157 warn "loading extensions"; 3548 warn "loading extensions";
3158 cf::load_extensions; 3549 cf::load_extensions;
3159 3550
3160 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
3180 3571
3181sub reload_perl() { 3572sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3184 3575
3185 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3577 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3192 },
3193 ); 3579 };
3194} 3580}
3195 3581
3196register_command "reload" => sub { 3582register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3198 3584
3199 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3589 reload_perl;
3590 };
3202 } 3591 }
3203}; 3592};
3204 3593
3205unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3206 3595
3225 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3616 $signal->wait;
3228} 3617}
3229 3618
3230 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3242 return; 3623 return;
3243 } 3624 }
3244 3625
3245 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3246 3627
3247 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3248 3629
3249 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3250 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254 3632
3255 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 $map->alloc; 3635 Coro::async_pool {
3258 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3259 my $t = Event::time - $t; 3637 write_runtime
3260 3638 or warn "ERROR: unable to write runtime file: $!";
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3639 };
3640 }
3271 3641
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3643 $sig->send;
3288 } 3644 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3646 $sig->send;
3291 } 3647 }
3292 3648
3293 $NOW = Event::time;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3651
3304 _post_tick; 3652 _post_tick;
3305 3653};
3306 3654$TICK_WATCHER->priority (EV::MAXPRI);
3307 },
3308);
3309 3655
3310{ 3656{
3311 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3658
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3321 3660 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3662
3337 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3669
3340 cf::sync_job { 3670 cf::sync_job {
3341 eval { 3671 eval {
3342 BDB::db_env_open 3672 BDB::db_env_open
3343 $DB_ENV, 3673 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3677 0666;
3348 3678
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3680 };
3354 3681
3355 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3683 };
3357 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3358} 3695}
3359 3696
3360{ 3697{
3698 # configure IO::AIO
3699
3361 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3703}
3374 3704
3375my $_log_backtrace; 3705my $_log_backtrace;
3376 3706
3377sub _log_backtrace { 3707sub _log_backtrace {
3381 3711
3382 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3714 ++$_log_backtrace;
3385 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3386 my @bt = fork_call { 3718 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines