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.354 by root, Sun Sep 2 12:26:54 2007 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 105our $DB_ENV;
86 106
87our %CFG; 107our %CFG;
88 108
89our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 110our $RUNTIME;
111our $NOW;
91 112
92our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
95 116
96# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
159 181
160The raw value load value from the last tick. 182The raw value load value from the last tick.
161 183
162=item %cf::CFG 184=item %cf::CFG
163 185
164Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 187from wherever your confdir points to.
166 188
167=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
168 190
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 209 $msg .= "\n"
188 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
189 211
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 213
192 utf8::encode $msg;
193 LOG llevError, $msg; 214 LOG llevError, $msg;
194 }; 215 };
195} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
196 232
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 243for my $pkg (qw(
208 cf::global cf::attachable 244 cf::global cf::attachable
209 cf::object cf::object::player 245 cf::object cf::object::player
210 cf::client cf::player 246 cf::client cf::player
211 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
212 cf::map cf::party cf::region 249 cf::party cf::region
213)) { 250)) {
214 no strict 'refs'; 251 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 253}
217 254
218$Event::DIED = sub { 255$EV::DIED = sub {
219 warn "error in event callback: @_"; 256 warn "error in event callback: @_";
220}; 257};
221 258
222############################################################################# 259#############################################################################
223 260
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 283 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 284 $d
248 } || "[unable to dump $_[0]: '$@']"; 285 } || "[unable to dump $_[0]: '$@']";
249} 286}
250 287
251=item $ref = cf::from_json $json 288=item $ref = cf::decode_json $json
252 289
253Converts a JSON string into the corresponding perl data structure. 290Converts a JSON string into the corresponding perl data structure.
254 291
255=item $json = cf::to_json $ref 292=item $json = cf::encode_json $ref
256 293
257Converts a perl data structure into its JSON representation. 294Converts a perl data structure into its JSON representation.
258 295
259=cut 296=cut
260 297
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 299
263sub to_json ($) { $json_coder->encode ($_[0]) } 300sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 301sub decode_json($) { $json_coder->decode ($_[0]) }
265 302
266=item cf::lock_wait $string 303=item cf::lock_wait $string
267 304
268Wait until the given lock is available. See cf::lock_acquire. 305Wait until the given lock is available. See cf::lock_acquire.
269 306
285Return true if the lock is currently active, i.e. somebody has locked it. 322Return true if the lock is currently active, i.e. somebody has locked it.
286 323
287=cut 324=cut
288 325
289our %LOCK; 326our %LOCK;
327our %LOCKER;#d#
290 328
291sub lock_wait($) { 329sub lock_wait($) {
292 my ($key) = @_; 330 my ($key) = @_;
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
293 336
294 # wait for lock, if any 337 # wait for lock, if any
295 while ($LOCK{$key}) { 338 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 339 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 340 Coro::schedule;
303 346
304 # wait, to be sure we are not locked 347 # wait, to be sure we are not locked
305 lock_wait $key; 348 lock_wait $key;
306 349
307 $LOCK{$key} = []; 350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
308 352
309 Coro::guard { 353 Coro::guard {
354 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 355 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 356 $_->ready for @{ delete $LOCK{$key} };
312 } 357 }
313} 358}
314 359
317 362
318 ! ! $LOCK{$key} 363 ! ! $LOCK{$key}
319} 364}
320 365
321sub freeze_mainloop { 366sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
323 368
324 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 370}
326 }; 371
327 $TICK_WATCHER->stop; 372=item cf::periodic $interval, $cb
328 $guard 373
374Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer.
376
377=cut
378
379sub periodic($$) {
380 my ($interval, $cb) = @_;
381
382 my $start = rand List::Util::min 180, $interval;
383
384 EV::periodic $start, $interval, 0, $cb
329} 385}
330 386
331=item cf::get_slot $time[, $priority[, $name]] 387=item cf::get_slot $time[, $priority[, $name]]
332 388
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 389Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 400our @SLOT_QUEUE;
345our $SLOT_QUEUE; 401our $SLOT_QUEUE;
346 402
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 403$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 404$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager");
406
349 my $signal = new Coro::Signal; 407 my $signal = new Coro::Signal;
350 408
351 while () { 409 while () {
352 next_job: 410 next_job:
353 my $avail = cf::till_tick; 411 my $avail = cf::till_tick;
361 } 419 }
362 } 420 }
363 } 421 }
364 422
365 if (@SLOT_QUEUE) { 423 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 424 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 425 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 426 $signal->wait;
369 } else { 427 } else {
370 Coro::schedule; 428 Coro::schedule;
371 } 429 }
372 } 430 }
373}; 431};
374 432
375sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
376 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
377 437
378 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
380 440
394 454
395BEGIN { *async = \&Coro::async_pool } 455BEGIN { *async = \&Coro::async_pool }
396 456
397=item cf::sync_job { BLOCK } 457=item cf::sync_job { BLOCK }
398 458
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 459The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 460is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 461partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 462acceptable.
403 463
404If it must be done, put the blocking parts into C<sync_job>. This will run 464If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 465the given BLOCK in another coroutine while waiting for the result. The
410 470
411sub sync_job(&) { 471sub sync_job(&) {
412 my ($job) = @_; 472 my ($job) = @_;
413 473
414 if ($Coro::current == $Coro::main) { 474 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 475 my $time = EV::time;
416 476
417 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
419 479
420 # TODO: use suspend/resume instead 480 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 481
422 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
423 483
424 my $busy = 1; 484 my $busy = 1;
425 my @res; 485 my @res;
426 486
427 (async { 487 (async {
488 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 489 @res = eval { $job->() };
429 warn $@ if $@; 490 warn $@ if $@;
430 undef $busy; 491 undef $busy;
431 })->prio (Coro::PRIO_MAX); 492 })->prio (Coro::PRIO_MAX);
432 493
433 while ($busy) { 494 while ($busy) {
434 Coro::cede or Event::one_event; 495 if (Coro::nready) {
496 Coro::cede_notself;
497 } else {
498 EV::loop EV::LOOP_ONESHOT;
435 } 499 }
500 }
436 501
437 $time = Event::time - $time; 502 my $time = EV::time - $time;
438 503
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 504 $TICK_START += $time; # do not account sync jobs to server load
443 505
444 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
445 } else { 507 } else {
446 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
447 509
472=item fork_call { }, $args 534=item fork_call { }, $args
473 535
474Executes the given code block with the given arguments in a seperate 536Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 537process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 538Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 539never block itself or use any form of event handling.
478 540
479=cut 541=cut
480 542
481sub fork_call(&@) { 543sub fork_call(&@) {
482 my ($cb, @args) = @_; 544 my ($cb, @args) = @_;
483 545
484 # we seemingly have to make a local copy of the whole thing, 546 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 547 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 548 # TODO: investigate and fix (likely this will be rather laborious)
487 549
488 my @res = Coro::Util::fork_eval { 550 my @res = Coro::Util::fork_eval {
489 reset_signals; 551 reset_signals;
490 &$cb 552 &$cb
491 }, @args; 553 }, @args;
492 554
493 wantarray ? @res : $res[-1] 555 wantarray ? @res : $res[-1]
494} 556}
495 557
558=item $coin = coin_from_name $name
559
560=cut
561
562our %coin_alias = (
563 "silver" => "silvercoin",
564 "silvercoin" => "silvercoin",
565 "silvercoins" => "silvercoin",
566 "gold" => "goldcoin",
567 "goldcoin" => "goldcoin",
568 "goldcoins" => "goldcoin",
569 "platinum" => "platinacoin",
570 "platinumcoin" => "platinacoin",
571 "platinumcoins" => "platinacoin",
572 "platina" => "platinacoin",
573 "platinacoin" => "platinacoin",
574 "platinacoins" => "platinacoin",
575 "royalty" => "royalty",
576 "royalties" => "royalty",
577);
578
579sub coin_from_name($) {
580 $coin_alias{$_[0]}
581 ? cf::arch::find $coin_alias{$_[0]}
582 : undef
583}
584
496=item $value = cf::db_get $family => $key 585=item $value = cf::db_get $family => $key
497 586
498Returns a single value from the environment database. 587Returns a single value from the environment database.
499 588
500=item cf::db_put $family => $key => $value 589=item cf::db_put $family => $key => $value
501 590
502Stores the given C<$value> in the family. It can currently store binary 591Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 592data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 593
594=item $db = cf::db_table "name"
595
596Create and/or open a new database table. The string must not be "db" and must be unique
597within each server.
598
505=cut 599=cut
600
601sub db_table($) {
602 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV;
604
605 eval {
606 $db->set_flags (BDB::CHKSUM);
607
608 utf8::encode $name;
609 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
610 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
611 cf::cleanup "db_open(db): $!" if $!;
612 };
613 cf::cleanup "db_open(db): $@" if $@;
614
615 $db
616}
506 617
507our $DB; 618our $DB;
508 619
509sub db_init { 620sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 621 cf::sync_job {
514 eval { 622 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 623 };
524} 624}
525 625
526sub db_get($$) { 626sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 627 my $key = "$_[0]/$_[1]";
528 628
632attach callbacks/event handlers (a collection of which is called an "attachment") 732attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 733to it. All such attachable objects support the following methods.
634 734
635In the following description, CLASS can be any of C<global>, C<object> 735In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 736C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 737Deliantra).
638 738
639=over 4 739=over 4
640 740
641=item $attachable->attach ($attachment, key => $value...) 741=item $attachable->attach ($attachment, key => $value...)
642 742
924 } 1024 }
925 1025
926 0 1026 0
927} 1027}
928 1028
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1030
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1031=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1032
933Generate an object-specific event with the given arguments. 1033Generate an object-specific event with the given arguments.
934 1034
940 1040
941=cut 1041=cut
942 1042
943############################################################################# 1043#############################################################################
944# object support 1044# object support
945#
946 1045
1046sub _object_equal($$);
1047sub _object_equal($$) {
1048 my ($a, $b) = @_;
1049
1050 return 0 unless (ref $a) eq (ref $b);
1051
1052 if ("HASH" eq ref $a) {
1053 my @ka = keys %$a;
1054 my @kb = keys %$b;
1055
1056 return 0 if @ka != @kb;
1057
1058 for (0 .. $#ka) {
1059 return 0 unless $ka[$_] eq $kb[$_];
1060 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1061 }
1062
1063 } elsif ("ARRAY" eq ref $a) {
1064
1065 return 0 if @$a != @$b;
1066
1067 for (0 .. $#$a) {
1068 return 0 unless _object_equal $a->[$_], $b->[$_];
1069 }
1070
1071 } elsif ($a ne $b) {
1072 return 0;
1073 }
1074
1075 1
1076}
1077
1078our $SLOW_MERGES;#d#
947sub _can_merge { 1079sub _can_merge {
948 my ($ob1, $ob2) = @_; 1080 my ($ob1, $ob2) = @_;
949 1081
950 local $Storable::canonical = 1; 1082 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1083
954 $fob1 eq $fob2 1084 # we do the slow way here
1085 return _object_equal $ob1, $ob2
955} 1086}
956 1087
957sub reattach { 1088sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1089 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1090 my ($obj) = @_;
981cf::attachable->attach ( 1112cf::attachable->attach (
982 prio => -1000000, 1113 prio => -1000000,
983 on_instantiate => sub { 1114 on_instantiate => sub {
984 my ($obj, $data) = @_; 1115 my ($obj, $data) = @_;
985 1116
986 $data = from_json $data; 1117 $data = decode_json $data;
987 1118
988 for (@$data) { 1119 for (@$data) {
989 my ($name, $args) = @$_; 1120 my ($name, $args) = @$_;
990 1121
991 $obj->attach ($name, %{$args || {} }); 1122 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1138sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1139 my ($filename, $rdata, $objs) = @_;
1009 1140
1010 sync_job { 1141 sync_job {
1011 if (length $$rdata) { 1142 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1014 1146
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1151 aio_close $fh;
1020 1152
1021 if (@$objs) { 1153 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1159 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1161 }
1030 } else { 1162 } else {
1031 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1032 } 1164 }
1037 } 1169 }
1038 } else { 1170 } else {
1039 aio_unlink $filename; 1171 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
1041 } 1173 }
1042 } 1174 };
1043} 1175}
1044 1176
1045sub object_freezer_as_string { 1177sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1178 my ($rdata, $objs) = @_;
1047 1179
1059 or return; 1191 or return;
1060 1192
1061 unless (aio_stat "$filename.pst") { 1193 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1194 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1195 or return;
1196
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1197 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs};
1065 } 1199 }
1066 1200
1201 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1202 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1203 $decname, length $data, scalar @{$av || []};
1204
1069 return ($data, $av); 1205 ($data, $av)
1070} 1206}
1071 1207
1072=head2 COMMAND CALLBACKS 1208=head2 COMMAND CALLBACKS
1073 1209
1074=over 4 1210=over 4
1223 my $msg = $@ ? "$v->{path}: $@\n" 1359 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1360 : "$v->{base}: extension inactive.\n";
1225 1361
1226 if (exists $v->{meta}{mandatory}) { 1362 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1363 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1364 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1365 }
1231 1366
1232 warn $msg; 1367 warn $msg;
1233 } 1368 }
1234 1369
1259use Coro::AIO; 1394use Coro::AIO;
1260 1395
1261=head3 cf::player 1396=head3 cf::player
1262 1397
1263=over 4 1398=over 4
1399
1400=item cf::player::num_playing
1401
1402Returns the official number of playing players, as per the Crossfire metaserver rules.
1403
1404=cut
1405
1406sub num_playing {
1407 scalar grep
1408 $_->ob->map
1409 && !$_->hidden
1410 && !$_->ob->flag (cf::FLAG_WIZ),
1411 cf::player::list
1412}
1264 1413
1265=item cf::player::find $login 1414=item cf::player::find $login
1266 1415
1267Returns the given player object, loading it if necessary (might block). 1416Returns the given player object, loading it if necessary (might block).
1268 1417
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1453 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1454 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1455 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1456 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1457
1309 my $pl = load_pl path $login 1458 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1459 or return;
1460
1461 my $pl = cf::player::load_pl $f
1462 or return;
1463
1464 local $cf::PLAYER_LOADING{$login} = $pl;
1465 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1312 } 1467 }
1313 } 1468 }
1314} 1469}
1315 1470
1323 1478
1324 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1325 1480
1326 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1483
1484 cf::get_slot 0.01;
1328 1485
1329 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1487 cf::cede_to_tick;
1331} 1488}
1332 1489
1368 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1370 1527
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1375 1534
1376 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
1416 1575
1417 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1418 my $path = path $login; 1577 my $path = path $login;
1419 1578
1420 # a .pst is a dead give-away for a valid player 1579 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") { 1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1423 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1424 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 } 1585 }
1426 1586
1463 1623
1464Expand crossfire pod fragments into protocol xml. 1624Expand crossfire pod fragments into protocol xml.
1465 1625
1466=cut 1626=cut
1467 1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1468sub expand_cfpod { 1639sub expand_cfpod {
1469 ((my $self), (local $_)) = @_; 1640 my ($self, $pod) = @_;
1470 1641
1471 # escape & and < 1642 my $xml;
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474 1643
1475 # this is buggy, it needs to properly take care of nested <'s 1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1476 1647
1477 1 while 1648 $group =~ s/&/&amp;/g;
1478 # replace B<>, I<>, U<> etc. 1649 $group =~ s/</&lt;/g;
1479 s/B<([^\>]*)>/<b>$1<\/b>/ 1650
1480 || s/I<([^\>]*)>/<i>$1<\/i>/ 1651 $xml .= $group;
1481 || s/U<([^\>]*)>/<u>$1<\/u>/ 1652 } elsif ($pod =~ m%\G
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1653 ([BCGHITU])
1483 # replace G<male|female> tags 1654 <
1484 || s{G<([^>|]*)\|([^>]*)>}{ 1655 (?:
1485 $self->gender ? $2 : $1 1656 ([^<>]*) (?{ $group = $^N })
1486 }ge 1657 | < $interior >
1487 # replace H<hint text> 1658 )
1488 || s{H<([^\>]*)>} 1659 >
1660 %gcsx
1489 { 1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "") 1681 "")
1493 [$self->{hintmode}] 1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1494 }ge; 1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1495 1693
1694 for ($xml) {
1496 # create single paragraphs (very hackish) 1695 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g; 1696 s/(?<=\S)\n(?=\w)/ /g;
1498 1697
1499 # compress some whitespace 1698 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends 1699 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines 1700 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines 1701 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines 1702 s/\n+$//; # ending lines
1703 }
1504 1704
1505 $_ 1705 $xml
1506} 1706}
1707
1708no re 'eval';
1507 1709
1508sub hintmode { 1710sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1; 1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode} 1712 $_[0]{hintmode}
1511} 1713}
1583our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1584our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1585 1787
1586sub generate_random_map { 1788sub generate_random_map {
1587 my ($self, $rmp) = @_; 1789 my ($self, $rmp) = @_;
1790
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792
1588 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1589 $self->_create_random_map ( 1794 $self->_create_random_map (
1590 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1591 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1592 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 1919
1715# the temporary/swap location 1920# the temporary/swap location
1716sub save_path { 1921sub save_path {
1717 my ($self) = @_; 1922 my ($self) = @_;
1718 1923
1719 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1720 "$TMPDIR/$path.map" 1925 "$TMPDIR/$path.map"
1721} 1926}
1722 1927
1723# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1724sub uniq_path { 1929sub uniq_path {
1725 my ($self) = @_; 1930 my ($self) = @_;
1726 1931
1727 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1728 "$UNIQUEDIR/$path" 1933 "$UNIQUEDIR/$path"
1729} 1934}
1730 1935
1731# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1732# all maps in C++... 1937# all maps in C++...
1755 1960
1756sub load_header_from($) { 1961sub load_header_from($) {
1757 my ($self, $path) = @_; 1962 my ($self, $path) = @_;
1758 1963
1759 utf8::encode $path; 1964 utf8::encode $path;
1760 #aio_open $path, O_RDONLY, 0 1965 my $f = new_from_file cf::object::thawer $path
1761 # or return;
1762
1763 $self->_load_header ($path)
1764 or return; 1966 or return;
1967
1968 $self->_load_header ($f)
1969 or return;
1970
1971 local $MAP_LOADING{$self->{path}} = $self;
1972 $f->resolve_delayed_derefs;
1765 1973
1766 $self->{load_path} = $path; 1974 $self->{load_path} = $path;
1767 1975
1768 1 1976 1
1769} 1977}
1823sub find { 2031sub find {
1824 my ($path, $origin) = @_; 2032 my ($path, $origin) = @_;
1825 2033
1826 $path = normalise $path, $origin && $origin->path; 2034 $path = normalise $path, $origin && $origin->path;
1827 2035
2036 cf::lock_wait "map_data:$path";#d#remove
1828 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1829 2038
1830 $cf::MAP{$path} || do { 2039 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1831 my $guard = cf::lock_acquire "map_find:$path"; 2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
1832 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1833 or return; 2044 or return;
1834 2045
1835 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
1836 2047
1838 or return; 2049 or return;
1839 2050
1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1841 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1842 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
2055 undef $guard1;
1843 $map->reset; 2056 $map->reset;
1844 undef $guard;
1845 return find $path; 2057 return find $path;
1846 } 2058 }
1847 2059
1848 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
1849 } 2061 }
1858 local $self->{deny_reset} = 1; # loading can take a long time 2070 local $self->{deny_reset} = 1; # loading can take a long time
1859 2071
1860 my $path = $self->{path}; 2072 my $path = $self->{path};
1861 2073
1862 { 2074 {
1863 my $guard1 = cf::lock_acquire "map_data:$path"; 2075 my $guard = cf::lock_acquire "map_data:$path";
1864 my $guard2 = cf::lock_acquire "map_load:$path";
1865 2076
2077 return unless $self->valid;
1866 return if $self->in_memory != cf::MAP_SWAPPED; 2078 return unless $self->in_memory == cf::MAP_SWAPPED;
1867 2079
1868 $self->in_memory (cf::MAP_LOADING); 2080 $self->in_memory (cf::MAP_LOADING);
1869 2081
1870 $self->alloc; 2082 $self->alloc;
1871 2083
1872 $self->pre_load; 2084 $self->pre_load;
1873 cf::cede_to_tick; 2085 cf::cede_to_tick;
1874 2086
2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block;
1875 $self->_load_objects ($self->{load_path}, 1) 2089 $self->_load_objects ($f)
1876 or return; 2090 or return;
1877 2091
1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
1879 if delete $self->{load_original}; 2093 if delete $self->{load_original};
1880 2094
1881 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
1882 utf8::encode $uniq; 2096 utf8::encode $uniq;
1883 if (aio_open $uniq, O_RDONLY, 0) { 2097 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) {
1884 $self->clear_unique_items; 2099 $self->clear_unique_items;
1885 $self->_load_objects ($uniq, 0); 2100 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs;
2102 }
1886 } 2103 }
1887 } 2104 }
2105
2106 $f->resolve_delayed_derefs;
1888 2107
1889 cf::cede_to_tick; 2108 cf::cede_to_tick;
1890 # now do the right thing for maps 2109 # now do the right thing for maps
1891 $self->link_multipart_objects; 2110 $self->link_multipart_objects;
1892 $self->difficulty ($self->estimate_difficulty) 2111 $self->difficulty ($self->estimate_difficulty)
1904 } 2123 }
1905 2124
1906 $self->{last_save} = $cf::RUNTIME; 2125 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME); 2126 $self->last_access ($cf::RUNTIME);
1908 2127
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2129 }
1911 2130
1912 $self->post_load; 2131 $self->post_load;
1913} 2132}
1914 2133
1972 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
1973 2192
1974 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
1975 2194
1976 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1978 } 2197 }
1979 2198
1980 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
1981 2200
1982 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2202 $Coro::current->{desc} = "map prefetcher";
2203
1983 while (%MAP_PREFETCH) { 2204 while (%MAP_PREFETCH) {
1984 while (my ($k, $v) = each %MAP_PREFETCH) { 2205 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $k) { 2206 if (my $map = find $k) {
1986 $map->load if $v; 2207 $map->load if $v;
1987 } 2208 }
2013 return if $self->{deny_save}; 2234 return if $self->{deny_save};
2014 2235
2015 local $self->{last_access} = $self->last_access;#d# 2236 local $self->{last_access} = $self->last_access;#d#
2016 2237
2017 cf::async { 2238 cf::async {
2239 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2019 }; 2241 };
2242
2243 cf::get_slot 0.02;
2020 2244
2021 if ($uniq) { 2245 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2248 } else {
2033 $self->save; 2257 $self->save;
2034 2258
2035 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2260
2037 return if $self->players; 2261 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2039 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2040 2264
2265 $self->in_memory (cf::MAP_SWAPPED);
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2269 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2270}
2044 2271
2045sub reset_at { 2272sub reset_at {
2046 my ($self) = @_; 2273 my ($self) = @_;
2047 2274
2079 if $uniq; 2306 if $uniq;
2080 } 2307 }
2081 2308
2082 delete $cf::MAP{$self->path}; 2309 delete $cf::MAP{$self->path};
2083 2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2313 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2314
2088 $self->unlink_save; 2315 $self->unlink_save;
2089 $self->destroy; 2316 $self->destroy;
2090} 2317}
2091 2318
2158 2385
2159sub unique_maps() { 2386sub unique_maps() {
2160 [ 2387 [
2161 map { 2388 map {
2162 utf8::decode $_; 2389 utf8::decode $_;
2163 /\.map$/ 2390 s/\.map$//; # TODO future compatibility hack
2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2392 ? ()
2164 ? normalise $_ 2393 : normalise $_
2165 : ()
2166 } @{ aio_readdir $UNIQUEDIR or [] } 2394 } @{ aio_readdir $UNIQUEDIR or [] }
2167 ] 2395 ]
2168} 2396}
2169 2397
2170package cf;
2171
2172=back 2398=back
2173 2399
2174=head3 cf::object 2400=head3 cf::object
2175 2401
2176=cut 2402=cut
2179 2405
2180=over 4 2406=over 4
2181 2407
2182=item $ob->inv_recursive 2408=item $ob->inv_recursive
2183 2409
2184Returns the inventory of the object _and_ their inventories, recursively. 2410Returns the inventory of the object I<and> their inventories, recursively,
2411but I<not> the object itself.
2185 2412
2186=cut 2413=cut
2187 2414
2188sub inv_recursive_; 2415sub inv_recursive_;
2189sub inv_recursive_ { 2416sub inv_recursive_ {
2192 2419
2193sub inv_recursive { 2420sub inv_recursive {
2194 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
2195} 2422}
2196 2423
2424=item $ref = $ob->ref
2425
2426Creates and returns a persistent reference to an object that can be stored as a string.
2427
2428=item $ob = cf::object::deref ($refstring)
2429
2430returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2431even if the object actually exists. May block.
2432
2433=cut
2434
2435sub deref {
2436 my ($ref) = @_;
2437
2438 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2439 my ($uuid, $name) = ($1, $2);
2440 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2441 or return;
2442 $pl->ob->uuid eq $uuid
2443 or return;
2444
2445 $pl->ob
2446 } else {
2447 warn "$ref: cannot resolve object reference\n";
2448 undef
2449 }
2450}
2451
2197package cf; 2452package cf;
2198 2453
2199=back 2454=back
2200 2455
2201=head3 cf::object::player 2456=head3 cf::object::player
2207Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2462Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2208can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2209dialogue with the given NPC character. 2464dialogue with the given NPC character.
2210 2465
2211=cut 2466=cut
2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2212 2481
2213# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2214# with dialog boxes. 2483# with dialog boxes.
2215#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2216sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2228 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2230 2499
2231 } else { 2500 } else {
2232 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2233 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2234 } 2503 }
2235 } 2504 }
2236} 2505}
2237 2506
2238=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
2346her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2347that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2348the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process. 2618be called at the end of this process.
2350 2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2622
2351=cut 2623=cut
2352 2624
2353our $GOTOGEN; 2625our $GOTOGEN;
2354 2626
2355sub cf::object::player::goto { 2627sub cf::object::player::goto {
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2632
2361 $self->enter_link; 2633 $self->enter_link;
2362 2634
2363 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2364 my $map = eval { 2657 my $map = eval {
2365 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2366 2659
2367 if ($map) { 2660 if ($map) {
2368 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2370 } else { 2663 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2665 }
2373 2666
2374 $map 2667 $map
2375 }; 2668 };
2376 2669
2412} 2705}
2413 2706
2414sub prepare_random_map { 2707sub prepare_random_map {
2415 my ($exit) = @_; 2708 my ($exit) = @_;
2416 2709
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2712 # that depends on the exit object
2422 2713
2423 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
2425 if ($exit->map) { 2716 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2430 } 2723 }
2431 2724
2432 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2433 2726
2434 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2437 2730
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2733 undef $fh;
2441 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2442 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2445 } 2742 }
2446} 2743}
2447 2744
2448sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2450 2747
2451 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2452 2749
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2750 $self->enter_link;
2465 2751
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2752 (async {
2471 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2472 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2473 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2474 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2475 1; 2776 1
2476 }) { 2777 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2478 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2479 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2811the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2812the message unless the client supports the msg packet.
2512 2813
2513=cut 2814=cut
2514 2815
2816# non-persistent channels (usually the info channel)
2515our %CHANNEL = ( 2817our %CHANNEL = (
2516 "c/identify" => { 2818 "c/identify" => {
2517 id => "identify", 2819 id => "infobox",
2518 title => "Identify", 2820 title => "Identify",
2519 reply => undef, 2821 reply => undef,
2520 tooltip => "Items recently identified", 2822 tooltip => "Items recently identified",
2521 }, 2823 },
2522 "c/examine" => { 2824 "c/examine" => {
2523 id => "examine", 2825 id => "infobox",
2524 title => "Examine", 2826 title => "Examine",
2525 reply => undef, 2827 reply => undef,
2526 tooltip => "Signs and other items you examined", 2828 tooltip => "Signs and other items you examined",
2527 }, 2829 },
2830 "c/book" => {
2831 id => "infobox",
2832 title => "Book",
2833 reply => undef,
2834 tooltip => "The contents of a note or book",
2835 },
2836 "c/lookat" => {
2837 id => "infobox",
2838 title => "Look",
2839 reply => undef,
2840 tooltip => "What you saw there",
2841 },
2842 "c/who" => {
2843 id => "infobox",
2844 title => "Players",
2845 reply => undef,
2846 tooltip => "Shows players who are currently online",
2847 },
2848 "c/body" => {
2849 id => "infobox",
2850 title => "Body Parts",
2851 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available",
2853 },
2854 "c/uptime" => {
2855 id => "infobox",
2856 title => "Uptime",
2857 reply => undef,
2858 tooltip => "How long the server has been running since last restart",
2859 },
2860 "c/mapinfo" => {
2861 id => "infobox",
2862 title => "Map Info",
2863 reply => undef,
2864 tooltip => "Information related to the maps",
2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2528); 2872);
2529 2873
2530sub cf::client::send_msg { 2874sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2532 2876
2533 $msg = $self->pl->expand_cfpod ($msg); 2877 $msg = $self->pl->expand_cfpod ($msg);
2534 2878
2535 $color &= cf::NDI_CLIENT_MASK; # just in case... 2879 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536 2880
2537 # check predefined channels, for the benefit of C 2881 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2882 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel};
2539 2884
2885 $self->ext_msg (channel_info => $channel)
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id};
2889
2540 if (ref $channel) { 2890 } elsif (ref $channel) {
2541 # send meta info to client, if not yet sent 2891 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) { 2892 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel; 2893 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg; 2895 if $self->can_msg;
2762=pod 3112=pod
2763 3113
2764The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
2765 3115
2766 cf::object 3116 cf::object
2767 contr pay_amount pay_player map x y force_find force_add 3117 contr pay_amount pay_player map x y force_find force_add destroy
2768 insert remove name archname title slaying race decrease_ob_nr 3118 insert remove name archname title slaying race decrease split
2769 3119
2770 cf::object::player 3120 cf::object::player
2771 player 3121 player
2772 3122
2773 cf::player 3123 cf::player
2778 3128
2779=cut 3129=cut
2780 3130
2781for ( 3131for (
2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
2784 decrease_ob_nr)], 3134 decrease split destroy change_exp)],
2785 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
2786 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
2787 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
2788) { 3138) {
2789 no strict 'refs'; 3139 no strict 'refs';
2894 { 3244 {
2895 my $faces = $facedata->{faceinfo}; 3245 my $faces = $facedata->{faceinfo};
2896 3246
2897 while (my ($face, $info) = each %$faces) { 3247 while (my ($face, $info) = each %$faces) {
2898 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3248 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249
2899 cf::face::set_visibility $idx, $info->{visibility}; 3250 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap}; 3251 cf::face::set_magicmap $idx, $info->{magicmap};
2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2903 3254
2904 cf::cede_to_tick; 3255 cf::cede_to_tick;
2905 } 3256 }
2906 3257
2907 while (my ($face, $info) = each %$faces) { 3258 while (my ($face, $info) = each %$faces) {
2908 next unless $info->{smooth}; 3259 next unless $info->{smooth};
3260
2909 my $idx = cf::face::find $face 3261 my $idx = cf::face::find $face
2910 or next; 3262 or next;
3263
2911 if (my $smooth = cf::face::find $info->{smooth}) { 3264 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth; 3265 cf::face::set_smooth $idx, $smooth;
2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2914 } else { 3267 } else {
2915 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3268 warn "smooth face '$info->{smooth}' not found for face '$face'";
2933 { 3286 {
2934 # TODO: for gcfclient pleasure, we should give resources 3287 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index. 3288 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource}; 3289 my $res = $facedata->{resource};
2937 3290
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) { 3291 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3293 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data; 3294 my $data;
2943 3295
2944 if ($info->{type} & 1) { 3296 if ($info->{type} & 1) {
2945 # prepend meta info 3297 # prepend meta info
2946 3298
2947 my $meta = $enc->encode ({ 3299 my $meta = $enc->encode ({
2948 name => $name, 3300 name => $name,
2949 %{ $info->{meta} || {} }, 3301 %{ $info->{meta} || {} },
2950 }); 3302 });
2951 3303
2952 $data = pack "(w/a*)*", $meta, $info->{data}; 3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type};
2953 } else { 3311 } else {
2954 $data = $info->{data}; 3312 $RESOURCE{$name} = $info;
2955 } 3313 }
2956 3314
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick; 3315 cf::cede_to_tick;
2961 } 3316 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2980 } 3317 }
3318
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2981 3320
2982 1 3321 1
2983} 3322}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
2984 3343
2985register_exticmd fx_want => sub { 3344register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_; 3345 my ($ns, $want) = @_;
2987 3346
2988 while (my ($k, $v) = each %$want) { 3347 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v); 3348 $ns->fx_want ($k, $v);
2990 } 3349 }
2991}; 3350};
3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
2992 3361
2993sub reload_regions { 3362sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework 3363 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?) 3364 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = (); 3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3010} 3379}
3011 3380
3012sub reload_archetypes { 3381sub reload_archetypes {
3013 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n"; 3383 or die "unable to load archetypes\n";
3015 #d# NEED to laod twice to resolve forward references
3016 # this really needs to be done in an extra post-pass
3017 # (which needs to be synchronous, so solve it differently)
3018 load_resource_file "$DATADIR/archetypes"
3019 or die "unable to load archetypes\n";
3020} 3384}
3021 3385
3022sub reload_treasures { 3386sub reload_treasures {
3023 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
3024 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
3025} 3389}
3026 3390
3027sub reload_resources { 3391sub reload_resources {
3028 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
3029 3393
3394 reload_facedata;
3395 reload_archetypes;
3030 reload_regions; 3396 reload_regions;
3031 reload_facedata;
3032 #reload_archetypes;#d#
3033 reload_archetypes;
3034 reload_treasures; 3397 reload_treasures;
3035 3398
3036 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3037} 3400}
3038 3401
3039sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3040 reload_resources; 3407 reload_resources;
3041} 3408}
3042 3409
3043sub reload_config { 3410sub reload_config {
3044 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
3045 or return; 3412 or return;
3046 3413
3047 local $/; 3414 local $/;
3048 *CFG = YAML::Syck::Load <$fh>; 3415 *CFG = YAML::Load <$fh>;
3049 3416
3050 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3051 3418
3052 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3053 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3064sub main { 3431sub main {
3065 # we must not ever block the main coroutine 3432 # we must not ever block the main coroutine
3066 local $Coro::idle = sub { 3433 local $Coro::idle = sub {
3067 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3068 (async { 3435 (async {
3069 Event::one_event; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT;
3070 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
3071 }; 3439 };
3072 3440
3441 {
3442 my $guard = freeze_mainloop;
3073 reload_config; 3443 reload_config;
3074 db_init; 3444 db_init;
3075 load_extensions; 3445 load_extensions;
3076 3446
3077 $TICK_WATCHER->start; 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3448 }
3449
3078 Event::loop; 3450 EV::loop;
3079} 3451}
3080 3452
3081############################################################################# 3453#############################################################################
3082# initialisation and cleanup 3454# initialisation and cleanup
3083 3455
3084# install some emergency cleanup handlers 3456# install some emergency cleanup handlers
3085BEGIN { 3457BEGIN {
3458 our %SIGWATCHER = ();
3086 for my $signal (qw(INT HUP TERM)) { 3459 for my $signal (qw(INT HUP TERM)) {
3087 Event->signal ( 3460 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3088 reentrant => 0,
3089 data => WF_AUTOCANCEL,
3090 signal => $signal,
3091 prio => 0,
3092 cb => sub {
3093 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
3094 },
3095 ); 3462 };
3096 } 3463 }
3097} 3464}
3098 3465
3099sub write_runtime { 3466sub write_runtime_sync {
3100 my $runtime = "$LOCALDIR/runtime"; 3467 my $runtime = "$LOCALDIR/runtime";
3101 3468
3102 # first touch the runtime file to show we are still running: 3469 # first touch the runtime file to show we are still running:
3103 # the fsync below can take a very very long time. 3470 # the fsync below can take a very very long time.
3104 3471
3130 and return; 3497 and return;
3131 3498
3132 warn "runtime file written.\n"; 3499 warn "runtime file written.\n";
3133 3500
3134 1 3501 1
3502}
3503
3504our $uuid_lock;
3505our $uuid_skip;
3506
3507sub write_uuid_sync($) {
3508 $uuid_skip ||= $_[0];
3509
3510 return if $uuid_lock;
3511 local $uuid_lock = 1;
3512
3513 my $uuid = "$LOCALDIR/uuid";
3514
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return;
3517
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3135} 3545}
3136 3546
3137sub emergency_save() { 3547sub emergency_save() {
3138 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3139 3549
3145 # and maps saved/destroyed asynchronously. 3555 # and maps saved/destroyed asynchronously.
3146 warn "begin emergency player save\n"; 3556 warn "begin emergency player save\n";
3147 for my $login (keys %cf::PLAYER) { 3557 for my $login (keys %cf::PLAYER) {
3148 my $pl = $cf::PLAYER{$login} or next; 3558 my $pl = $cf::PLAYER{$login} or next;
3149 $pl->valid or next; 3559 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3150 $pl->save; 3561 $pl->save;
3151 } 3562 }
3152 warn "end emergency player save\n"; 3563 warn "end emergency player save\n";
3153 3564
3154 warn "begin emergency map save\n"; 3565 warn "begin emergency map save\n";
3160 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
3161 3572
3162 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
3163 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
3164 warn "end emergency database checkpoint\n"; 3575 warn "end emergency database checkpoint\n";
3576
3577 warn "begin write uuid\n";
3578 write_uuid_sync 1;
3579 warn "end write uuid\n";
3165 }; 3580 };
3166 3581
3167 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
3168} 3583}
3169 3584
3184 warn "reloading..."; 3599 warn "reloading...";
3185 3600
3186 warn "entering sync_job"; 3601 warn "entering sync_job";
3187 3602
3188 cf::sync_job { 3603 cf::sync_job {
3189 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3190 cf::emergency_save; 3605 cf::emergency_save;
3191 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3192 3607
3193 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3194 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3195 3610
3196 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3197
3198 warn "cancelling all WF_AUTOCANCEL watchers";
3199 for (Event::all_watchers) {
3200 $_->cancel if $_->data & WF_AUTOCANCEL;
3201 }
3202 3612
3203 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3204 for (;;) { 3614 for (;;) {
3205 BDB::flush; 3615 BDB::flush;
3206 IO::AIO::flush; 3616 IO::AIO::flush;
3207 Coro::cede; 3617 Coro::cede_notself;
3208 last unless IO::AIO::nreqs || BDB::nreqs; 3618 last unless IO::AIO::nreqs || BDB::nreqs;
3209 warn "iterate..."; 3619 warn "iterate...";
3210 } 3620 }
3211 3621
3212 ++$RELOAD; 3622 ++$RELOAD;
3288 warn "leaving sync_job"; 3698 warn "leaving sync_job";
3289 3699
3290 1 3700 1
3291 } or do { 3701 } or do {
3292 warn $@; 3702 warn $@;
3293 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
3294 exit 1;
3295 }; 3704 };
3296 3705
3297 warn "reloaded"; 3706 warn "reloaded";
3298}; 3707};
3299 3708
3301 3710
3302sub reload_perl() { 3711sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
3305 3714
3306 $RELOAD_WATCHER ||= Event->timer ( 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3307 reentrant => 0,
3308 after => 0,
3309 data => WF_AUTOCANCEL,
3310 cb => sub {
3311 do_reload_perl; 3716 do_reload_perl;
3312 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
3313 },
3314 ); 3718 };
3315} 3719}
3316 3720
3317register_command "reload" => sub { 3721register_command "reload" => sub {
3318 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
3319 3723
3320 if ($who->flag (FLAG_WIZ)) { 3724 if ($who->flag (FLAG_WIZ)) {
3321 $who->message ("reloading server."); 3725 $who->message ("reloading server.");
3726 async {
3727 $Coro::current->{desc} = "perl_reload";
3322 async { reload_perl }; 3728 reload_perl;
3729 };
3323 } 3730 }
3324}; 3731};
3325 3732
3326unshift @INC, $LIBDIR; 3733unshift @INC, $LIBDIR;
3327 3734
3329 3736
3330our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3331our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3332 3739
3333sub wait_for_tick { 3740sub wait_for_tick {
3334 return unless $TICK_WATCHER->is_active;
3335 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3336 3742
3337 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3338 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3339 $signal->wait; 3745 $signal->wait;
3340} 3746}
3341 3747
3342sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3343 return unless $TICK_WATCHER->is_active;
3344 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3345 3750
3346 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait; 3753 $signal->wait;
3349} 3754}
3350 3755
3351 my $min = 1e6;#d# 3756sub tick {
3352 my $avg = 10;
3353$TICK_WATCHER = Event->timer (
3354 reentrant => 0,
3355 parked => 1,
3356 prio => 0,
3357 at => $NEXT_TICK || $TICK,
3358 data => WF_AUTOCANCEL,
3359 cb => sub {
3360 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3362 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
3363 return; 3760 return;
3364 } 3761 }
3365 3762
3366 $NOW = $tick_start = Event::time;
3367
3368 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
3369 3764
3370 0 && sync_job {#d# 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3371 for(1..10) { 3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3372 my $t = Event::time; 3767 Coro::async_pool {
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3768 $Coro::current->{desc} = "runtime saver";
3374 or die; 3769 write_runtime_sync
3375 3770 or warn "ERROR: unable to write runtime file: $!";
3376 $map->width (50);
3377 $map->height (50);
3378 $map->alloc;
3379 $map->_load_objects ("/tmp/x.map", 1);
3380 my $t = Event::time - $t;
3381
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 }; 3771 };
3772 }
3392 3773
3393 $RUNTIME += $TICK;
3394 $NEXT_TICK += $TICK;
3395
3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
3398 Coro::async_pool {
3399 write_runtime
3400 or warn "ERROR: unable to write runtime file: $!";
3401 };
3402 }
3403
3404# my $AFTER = Event::time;
3405# warn $AFTER - $NOW;#d#
3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send; 3775 $sig->send;
3409 } 3776 }
3410 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send; 3778 $sig->send;
3412 } 3779 }
3413 3780
3414 $NOW = Event::time; 3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3415
3416 # if we are delayed by four ticks or more, skip them all
3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3418
3419 $TICK_WATCHER->at ($NEXT_TICK);
3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424 3783
3425 _post_tick; 3784 if (0) {
3426 3785 if ($NEXT_TICK) {
3427 3786 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d#
3789 }
3428 }, 3790 }
3429); 3791}
3430 3792
3431{ 3793{
3432 BDB::max_poll_time $TICK * 0.1; 3794 # configure BDB
3433 $BDB_POLL_WATCHER = Event->io ( 3795
3434 reentrant => 0,
3435 fd => BDB::poll_fileno,
3436 poll => 'r',
3437 prio => 0,
3438 data => WF_AUTOCANCEL,
3439 cb => \&BDB::poll_cb,
3440 );
3441 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3442 3797 BDB::max_poll_reqs $TICK * 0.1;
3443 BDB::set_sync_prepare { 3798 $AnyEvent::BDB::WATCHER->priority (1);
3444 my $status;
3445 my $current = $Coro::current;
3446 (
3447 sub {
3448 $status = $!;
3449 $current->ready; undef $current;
3450 },
3451 sub {
3452 Coro::schedule while defined $current;
3453 $! = $status;
3454 },
3455 )
3456 };
3457 3799
3458 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3459 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3460 3807
3461 cf::sync_job { 3808 cf::sync_job {
3462 eval { 3809 eval {
3463 BDB::db_env_open 3810 BDB::db_env_open
3464 $DB_ENV, 3811 $DB_ENV,
3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3813 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3814 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3468 0666; 3815 0666;
3469 3816
3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3817 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3471
3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3473 $DB_ENV->set_lk_detect;
3474 }; 3818 };
3475 3819
3476 cf::cleanup "db_env_open(db): $@" if $@; 3820 cf::cleanup "db_env_open(db): $@" if $@;
3477 }; 3821 };
3478 } 3822 }
3823
3824 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3825 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3826 };
3827 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3828 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3829 };
3830 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3831 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3832 };
3479} 3833}
3480 3834
3481{ 3835{
3836 # configure IO::AIO
3837
3482 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3483
3484 undef $Coro::AIO::WATCHER;
3485 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3486 $AIO_POLL_WATCHER = Event->io ( 3840 undef $AnyEvent::AIO::WATCHER;
3487 reentrant => 0,
3488 data => WF_AUTOCANCEL,
3489 fd => IO::AIO::poll_fileno,
3490 poll => 'r',
3491 prio => 6,
3492 cb => \&IO::AIO::poll_cb,
3493 );
3494} 3841}
3495 3842
3496my $_log_backtrace; 3843my $_log_backtrace;
3497 3844
3498sub _log_backtrace { 3845sub _log_backtrace {
3502 3849
3503 # limit the # of concurrent backtraces 3850 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) { 3851 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace; 3852 ++$_log_backtrace;
3506 async { 3853 async {
3854 $Coro::current->{desc} = "abt $msg";
3855
3507 my @bt = fork_call { 3856 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr; 3857 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3858 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3859 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!"; 3860 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines