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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $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 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 211 $msg .= "\n"
188 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
189 213
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 215
192 utf8::encode $msg;
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 245for my $pkg (qw(
208 cf::global cf::attachable 246 cf::global cf::attachable
209 cf::object cf::object::player 247 cf::object cf::object::player
210 cf::client cf::player 248 cf::client cf::player
211 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
212 cf::map cf::party cf::region 251 cf::party cf::region
213)) { 252)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$Event::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
220}; 258};
221 259
222############################################################################# 260#############################################################################
223 261
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
272Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
275returned. 313returned.
276 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
277Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
279 320
280=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
281 322
282Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
283 324
284=cut 325=cut
285 326
286our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
287 329
288sub lock_wait($) { 330sub lock_wait($) {
289 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
290 337
291 # wait for lock, if any 338 # wait for lock, if any
292 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 341 Coro::schedule;
300 347
301 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
302 lock_wait $key; 349 lock_wait $key;
303 350
304 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
305 353
306 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
309 } 358 }
310} 359}
311 360
314 363
315 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
316} 365}
317 366
318sub freeze_mainloop { 367sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
320 369
321 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 371}
323 }; 372
324 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
325 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
326} 386}
327 387
328=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
329 389
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 401our @SLOT_QUEUE;
342our $SLOT_QUEUE; 402our $SLOT_QUEUE;
343 403
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
346 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
347 409
348 while () { 410 while () {
349 next_job: 411 next_job:
350 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
358 } 420 }
359 } 421 }
360 } 422 }
361 423
362 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 427 $signal->wait;
366 } else { 428 } else {
367 Coro::schedule; 429 Coro::schedule;
368 } 430 }
369 } 431 }
370}; 432};
371 433
372sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
373 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
374 438
375 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
377 441
391 455
392BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
393 457
394=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
395 459
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 463acceptable.
400 464
401If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
407 471
408sub sync_job(&) { 472sub sync_job(&) {
409 my ($job) = @_; 473 my ($job) = @_;
410 474
411 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 476 my $time = EV::time;
413 477
414 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
416 480
417 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 482
419 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
420 484
421 my $busy = 1; 485 my $busy = 1;
422 my @res; 486 my @res;
423 487
424 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 490 @res = eval { $job->() };
426 warn $@ if $@; 491 warn $@ if $@;
427 undef $busy; 492 undef $busy;
428 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
429 494
430 while ($busy) { 495 while ($busy) {
431 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
432 } 500 }
501 }
433 502
434 $time = Event::time - $time; 503 my $time = EV::time - $time;
435 504
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
440 506
441 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
442 } else { 508 } else {
443 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
444 510
469=item fork_call { }, $args 535=item fork_call { }, $args
470 536
471Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
475 541
476=cut 542=cut
477 543
478sub fork_call(&@) { 544sub fork_call(&@) {
479 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
480 546
481 # we seemingly have to make a local copy of the whole thing, 547 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 548 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 549 # TODO: investigate and fix (likely this will be rather laborious)
484 550
485 my @res = Coro::Util::fork_eval { 551 my @res = Coro::Util::fork_eval {
486 reset_signals; 552 reset_signals;
487 &$cb 553 &$cb
488 }, @args; 554 }, @args;
489 555
490 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
491} 557}
492 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
493=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
494 587
495Returns a single value from the environment database. 588Returns a single value from the environment database.
496 589
497=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
498 591
499Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
502=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
503 618
504our $DB; 619our $DB;
505 620
506sub db_init { 621sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 622 cf::sync_job {
511 eval { 623 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 624 };
521} 625}
522 626
523sub db_get($$) { 627sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
525 629
575 if (1) { 679 if (1) {
576 $md5 = 680 $md5 =
577 join "\x00", 681 join "\x00",
578 $processversion, 682 $processversion,
579 map { 683 map {
580 Coro::cede; 684 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 686 } 0.. $#$src;
583 687
584 688
585 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
631 735
632In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 738Deliantra).
635 739
636=over 4 740=over 4
637 741
638=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
639 743
921 } 1025 }
922 1026
923 0 1027 0
924} 1028}
925 1029
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1031
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1033
930Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
931 1035
937 1041
938=cut 1042=cut
939 1043
940############################################################################# 1044#############################################################################
941# object support 1045# object support
942#
943 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
944sub _can_merge { 1080sub _can_merge {
945 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
946 1082
947 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1084
951 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
952} 1087}
953 1088
954sub reattach { 1089sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1091 my ($obj) = @_;
957 1092
1093 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1095
960 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
961 1097
962 @$registry = (); 1098 @$registry = ();
963 1099
978cf::attachable->attach ( 1114cf::attachable->attach (
979 prio => -1000000, 1115 prio => -1000000,
980 on_instantiate => sub { 1116 on_instantiate => sub {
981 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
982 1118
983 $data = from_json $data; 1119 $data = decode_json $data;
984 1120
985 for (@$data) { 1121 for (@$data) {
986 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
987 1123
988 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1140sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1006 1142
1007 sync_job { 1143 sync_job {
1008 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1011 1148
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1153 aio_close $fh;
1017 1154
1018 if (@$objs) { 1155 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1161 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1163 }
1027 } else { 1164 } else {
1028 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1029 } 1166 }
1034 } 1171 }
1035 } else { 1172 } else {
1036 aio_unlink $filename; 1173 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1038 } 1175 }
1039 } 1176 };
1040} 1177}
1041 1178
1042sub object_freezer_as_string { 1179sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1044 1181
1056 or return; 1193 or return;
1057 1194
1058 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1197 or return;
1198
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1062 } 1201 }
1063 1202
1203 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1066 return ($data, $av); 1207 ($data, $av)
1067} 1208}
1068 1209
1069=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1070 1211
1071=over 4 1212=over 4
1149 my ($type, $reply, @payload) = 1290 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1291 "ARRAY" eq ref $msg
1151 ? @$msg 1292 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1294
1295 my @reply;
1296
1154 if (my $cb = $EXTCMD{$type}) { 1297 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1298 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1160 } else { 1304 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1306 }
1163 1307
1164 cf::override; 1308 cf::override;
1191 1335
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1338
1195 $ext{source} = 1339 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1198 . $source 1342 . $source
1199 . "\n};\n1"; 1343 . "\n};\n1";
1200 1344
1201 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1219 1363
1220 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1365 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1367 }
1225 1368
1226 warn $msg; 1369 warn $msg;
1227 } 1370 }
1228 1371
1253use Coro::AIO; 1396use Coro::AIO;
1254 1397
1255=head3 cf::player 1398=head3 cf::player
1256 1399
1257=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1258 1415
1259=item cf::player::find $login 1416=item cf::player::find $login
1260 1417
1261Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1262 1419
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1459
1303 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1306 } 1469 }
1307 } 1470 }
1308} 1471}
1309 1472
1318 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1319 1482
1320 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1322 1485
1486 cf::get_slot 0.01;
1487
1323 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1324 Coro::cede; 1489 cf::cede_to_tick;
1325} 1490}
1326 1491
1327sub new($) { 1492sub new($) {
1328 my ($login) = @_; 1493 my ($login) = @_;
1329 1494
1358 my ($pl) = @_; 1523 my ($pl) = @_;
1359 1524
1360 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1361 1526
1362 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1364 1529
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1369 1536
1370 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1574 or return [];
1408 1575
1409 my @logins; 1576 my @logins;
1410 1577
1411 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1415 1588
1416 utf8::decode $login; 1589 utf8::decode $login;
1417 push @logins, $login; 1590 push @logins, $login;
1418 } 1591 }
1419 1592
1453Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1454 1627
1455=cut 1628=cut
1456 1629
1457sub expand_cfpod { 1630sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1459 1632
1460 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1461 s/&/&amp;/g; 1634 my $xml;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1635
1464 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1465 1648
1466 1 while 1649 my $cb;
1467 # replace B<>, I<>, U<> etc. 1650
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1471 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1473 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1474 }ge 1657 } elsif ($code eq "G") {
1475 # replace H<hint text> 1658 $cb = sub {
1476 || s{H<([^\>]*)>} 1659 my ($male, $female) = split /\|/, $_[0];
1477 { 1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1667 "",
1481 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1482 }ge; 1707 }
1708 }
1709 }
1483 1710
1484 # create single paragraphs (very hackish) 1711 $xml
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494} 1712}
1495 1713
1496sub hintmode { 1714sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1716 $_[0]{hintmode}
1505=cut 1723=cut
1506 1724
1507sub ext_reply($$@) { 1725sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1726 my ($self, $id, @msg) = @_;
1509 1727
1510 if ($self->ns->extcmd == 2) { 1728 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1729}
1518 1730
1519=item $player->ext_msg ($type, @msg) 1731=item $player->ext_msg ($type, @msg)
1520 1732
1521Sends an ext event to the client. 1733Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1579 1791
1580sub generate_random_map { 1792sub generate_random_map {
1581 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1582 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1798 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1923
1709# the temporary/swap location 1924# the temporary/swap location
1710sub save_path { 1925sub save_path {
1711 my ($self) = @_; 1926 my ($self) = @_;
1712 1927
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1715} 1930}
1716 1931
1717# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1718sub uniq_path { 1933sub uniq_path {
1719 my ($self) = @_; 1934 my ($self) = @_;
1720 1935
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1723} 1938}
1724 1939
1725# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1726# all maps in C++... 1941# all maps in C++...
1749 1964
1750sub load_header_from($) { 1965sub load_header_from($) {
1751 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1752 1967
1753 utf8::encode $path; 1968 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1970 or return;
1971
1972 $self->_load_header ($f)
1973 or return;
1974
1975 local $MAP_LOADING{$self->{path}} = $self;
1976 $f->resolve_delayed_derefs;
1759 1977
1760 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1761 1979
1762 1 1980 1
1763} 1981}
1817sub find { 2035sub find {
1818 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1819 2037
1820 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1821 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1823 2042
1824 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1825 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1826 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1827 or return; 2048 or return;
1828 2049
1829 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1830 2051
1832 or return; 2053 or return;
1833 2054
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1837 $map->reset; 2060 $map->reset;
1838 undef $guard;
1839 return find $path; 2061 return find $path;
1840 } 2062 }
1841 2063
1842 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1843 } 2065 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1853 2075
1854 my $path = $self->{path}; 2076 my $path = $self->{path};
1855 2077
1856 { 2078 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1858 2080
2081 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2083
1861 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1862 2085
1863 $self->alloc; 2086 $self->alloc;
1864 2087
1865 $self->pre_load; 2088 $self->pre_load;
1866 Coro::cede; 2089 cf::cede_to_tick;
1867 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1869 or return; 2094 or return;
1870 2095
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1872 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1873 2098
1874 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2100 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2103 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1879 } 2107 }
1880 } 2108 }
1881 2109
1882 Coro::cede; 2110 $f->resolve_delayed_derefs;
2111
2112 cf::cede_to_tick;
1883 # now do the right thing for maps 2113 # now do the right thing for maps
1884 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2116 unless $self->difficulty;
1887 Coro::cede; 2117 cf::cede_to_tick;
1888 2118
1889 unless ($self->{deny_activate}) { 2119 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2120 $self->decay_objects;
1891 $self->fix_auto_apply; 2121 $self->fix_auto_apply;
1892 $self->update_buttons; 2122 $self->update_buttons;
1893 Coro::cede; 2123 cf::cede_to_tick;
1894 $self->set_darkness_map; 2124 $self->set_darkness_map;
1895 Coro::cede; 2125 cf::cede_to_tick;
1896 $self->activate; 2126 $self->activate;
1897 } 2127 }
1898 2128
1899 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1901 2131
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2133 }
1904 2134
1905 $self->post_load; 2135 $self->post_load;
1906} 2136}
1907 2137
1916 2146
1917 $self 2147 $self
1918} 2148}
1919 2149
1920# find and load all maps in the 3x3 area around a map 2150# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2151sub load_neighbours {
1922 my ($map) = @_; 2152 my ($map) = @_;
1923 2153
1924 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1925 2155
1926 for (0 .. 3) { 2156 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1928 or next; 2158 or next;
1929 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1930 or next; 2160 or next;
1931 $neigh->load; 2161 $neigh->load;
1932 2162
2163 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2166 }
1936 2167
1937 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1939 or next; 2171 or next;
1940 $neigh->load; 2172 $neigh->load;
1941 } 2173 }
1942} 2174}
1943 2175
1948} 2180}
1949 2181
1950sub do_load_sync { 2182sub do_load_sync {
1951 my ($map) = @_; 2183 my ($map) = @_;
1952 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1953 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1954} 2189}
1955 2190
1956our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1958 2193
1959sub find_async { 2194sub find_async {
1960 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1961 2196
1962 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1963 2198
1964 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2201 }
1967 2202
1968 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1969 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1970 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2210 if (my $map = find $k) {
1973 $map->load; 2211 $map->load if $v;
1974 } 2212 }
1975 2213
1976 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
1977 } 2215 }
1978 } 2216 }
1979 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
1980 }; 2218 };
1981 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
1984} 2222}
1985 2223
1986sub save { 2224sub save {
1987 my ($self) = @_; 2225 my ($self) = @_;
1988 2226
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2228
1991 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
1992 2230
1993 return unless $self->dirty; 2231 return unless $self->dirty;
1994 2232
2000 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2001 2239
2002 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2003 2241
2004 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2006 }; 2245 };
2246
2247 cf::get_slot 0.02;
2007 2248
2008 if ($uniq) { 2249 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2252 } else {
2017 my ($self) = @_; 2258 my ($self) = @_;
2018 2259
2019 # save first because save cedes 2260 # save first because save cedes
2020 $self->save; 2261 $self->save;
2021 2262
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2264
2024 return if $self->players; 2265 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2027 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2273 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2274}
2031 2275
2032sub reset_at { 2276sub reset_at {
2033 my ($self) = @_; 2277 my ($self) = @_;
2034 2278
2066 if $uniq; 2310 if $uniq;
2067 } 2311 }
2068 2312
2069 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2070 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2317 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2318
2075 $self->unlink_save; 2319 $self->unlink_save;
2076 $self->destroy; 2320 $self->destroy;
2077} 2321}
2078 2322
2079my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
2080 2324
2081sub nuke { 2325sub nuke {
2082 my ($self) = @_; 2326 my ($self) = @_;
2083 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
2084 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2085 2332
2086 $self->unlink_save; 2333 $self->unlink_save;
2087 2334
2088 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2340
2094 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
2095 2343
2096 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2097} 2345}
2098 2346
2099=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2141 2389
2142sub unique_maps() { 2390sub unique_maps() {
2143 [ 2391 [
2144 map { 2392 map {
2145 utf8::decode $_; 2393 utf8::decode $_;
2146 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2147 ? normalise $_ 2397 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2399 ]
2151} 2400}
2152 2401
2153package cf;
2154
2155=back 2402=back
2156 2403
2157=head3 cf::object 2404=head3 cf::object
2158 2405
2159=cut 2406=cut
2162 2409
2163=over 4 2410=over 4
2164 2411
2165=item $ob->inv_recursive 2412=item $ob->inv_recursive
2166 2413
2167Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2168 2416
2169=cut 2417=cut
2170 2418
2171sub inv_recursive_; 2419sub inv_recursive_;
2172sub inv_recursive_ { 2420sub inv_recursive_ {
2175 2423
2176sub inv_recursive { 2424sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2178} 2426}
2179 2427
2428=item $ref = $ob->ref
2429
2430Creates and returns a persistent reference to an object that can be stored as a string.
2431
2432=item $ob = cf::object::deref ($refstring)
2433
2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2435even if the object actually exists. May block.
2436
2437=cut
2438
2439sub deref {
2440 my ($ref) = @_;
2441
2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2443 my ($uuid, $name) = ($1, $2);
2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2445 or return;
2446 $pl->ob->uuid eq $uuid
2447 or return;
2448
2449 $pl->ob
2450 } else {
2451 warn "$ref: cannot resolve object reference\n";
2452 undef
2453 }
2454}
2455
2180package cf; 2456package cf;
2181 2457
2182=back 2458=back
2183 2459
2184=head3 cf::object::player 2460=head3 cf::object::player
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2466Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2192dialogue with the given NPC character. 2468dialogue with the given NPC character.
2193 2469
2194=cut 2470=cut
2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2195 2485
2196# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2487# with dialog boxes.
2198#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2199sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213 2503
2214 } else { 2504 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2507 }
2218 } 2508 }
2219} 2509}
2220 2510
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2312 # use -1 or undef as default coordinates, not 0, 0 2602 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2603 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2604 if $x <=0 && $y <= 0;
2315 2605
2316 $map->load; 2606 $map->load;
2317 $map->load_diag; 2607 $map->load_neighbours;
2318 2608
2319 return unless $self->contr->active; 2609 return unless $self->contr->active;
2320 $self->activate_recursive; 2610 $self->activate_recursive;
2321 2611
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2329her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2330that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2331the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process. 2622be called at the end of this process.
2333 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2334=cut 2627=cut
2335 2628
2336our $GOTOGEN; 2629our $GOTOGEN;
2337 2630
2338sub cf::object::player::goto { 2631sub cf::object::player::goto {
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2636
2344 $self->enter_link; 2637 $self->enter_link;
2345 2638
2346 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2347 my $map = eval { 2661 my $map = eval {
2348 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2349 2663
2350 if ($map) { 2664 if ($map) {
2351 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2353 } else { 2667 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2669 }
2356 2670
2357 $map 2671 $map
2358 }; 2672 };
2359 2673
2395} 2709}
2396 2710
2397sub prepare_random_map { 2711sub prepare_random_map {
2398 my ($exit) = @_; 2712 my ($exit) = @_;
2399 2713
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2716 # that depends on the exit object
2405 2717
2406 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2720 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2413 } 2727 }
2414 2728
2415 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2416 2730
2417 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2420 2734
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2737 undef $fh;
2424 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2425 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2428 } 2746 }
2429} 2747}
2430 2748
2431sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2433 2751
2434 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2435 2753
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2754 $self->enter_link;
2448 2755
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2756 (async {
2454 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2455 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2456 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2457 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2458 1; 2780 1
2459 }) { 2781 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2461 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2462 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2495 2817
2496=cut 2818=cut
2497 2819
2820# non-persistent channels (usually the info channel)
2821our %CHANNEL = (
2822 "c/identify" => {
2823 id => "infobox",
2824 title => "Identify",
2825 reply => undef,
2826 tooltip => "Items recently identified",
2827 },
2828 "c/examine" => {
2829 id => "infobox",
2830 title => "Examine",
2831 reply => undef,
2832 tooltip => "Signs and other items you examined",
2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2876);
2877
2498sub cf::client::send_msg { 2878sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2880
2501 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2502 2882
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2884
2885 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2505 if (ref $channel) { 2894 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2510 } 2900 }
2511 2901
2512 $channel = $channel->{id}; 2902 $channel = $channel->{id};
2513 } 2903 }
2514 2904
2517 if ($self->can_msg) { 2907 if ($self->can_msg) {
2518 # default colour, mask it out 2908 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2521 2911
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2524 } else { 2928 } else {
2525 if ($color >= 0) { 2929 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2527 for ($msg) { 2931 for ($msg) {
2528 1 while 2932 1 while
2555=cut 2959=cut
2556 2960
2557sub cf::client::ext_msg($$@) { 2961sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2962 my ($self, $type, @msg) = @_;
2559 2963
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2964 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2966 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2967 push @msg, msgtype => "event_$type";
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2970}
2971
2972=item $client->ext_reply ($msgid, @msg)
2973
2974Sends an ext reply to the client.
2975
2976=cut
2977
2978sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_;
2980
2981 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2987 }
2568} 2988}
2569 2989
2570=item $success = $client->query ($flags, "text", \&cb) 2990=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 3052 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 3053 "ARRAY" eq ref $msg
2634 ? @$msg 3054 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3055 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 3056
3057 my @reply;
3058
2637 if (my $cb = $EXTICMD{$type}) { 3059 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 3060 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 3061 }
3062
3063 $ns->ext_reply ($reply, @reply)
3064 if $reply;
3065
2643 } else { 3066 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3067 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 3068 }
2646 3069
2647 cf::override; 3070 cf::override;
2707=pod 3130=pod
2708 3131
2709The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2710 3133
2711 cf::object 3134 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3136 insert remove name archname title slaying race decrease split
2714 3137
2715 cf::object::player 3138 cf::object::player
2716 player 3139 player
2717 3140
2718 cf::player 3141 cf::player
2723 3146
2724=cut 3147=cut
2725 3148
2726for ( 3149for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3151 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2732) { 3156) {
2733 no strict 'refs'; 3157 no strict 'refs';
2809# the server's init and main functions 3233# the server's init and main functions
2810 3234
2811sub load_facedata($) { 3235sub load_facedata($) {
2812 my ($path) = @_; 3236 my ($path) = @_;
2813 3237
3238 # HACK to clear player env face cache, we need some signal framework
3239 # for this (global event?)
3240 %ext::player_env::MUSIC_FACE_CACHE = ();
3241
3242 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3243
2814 warn "loading facedata from $path\n"; 3244 warn "loading facedata from $path\n";
2815 3245
2816 my $facedata; 3246 my $facedata;
2817 0 < aio_load $path, $facedata 3247 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3248 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3250 $facedata = Coro::Storable::thaw $facedata;
2821 3251
2822 $facedata->{version} == 2 3252 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3253 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3254
3255 # patch in the exptable
3256 $facedata->{resource}{"res/exp_table"} = {
3257 type => FT_RSRC,
3258 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3259 };
3260 cf::cede_to_tick;
3261
2825 { 3262 {
2826 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
2827 3264
2828 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
2830 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3272
2835 cf::cede_to_tick; 3273 cf::cede_to_tick;
2836 } 3274 }
2837 3275
2838 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
2840 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
2841 or next; 3280 or next;
3281
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3285 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3303
2864 { 3304 {
2865 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3308
2872 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3310 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
2879 3313
2880 if ($info->{type} & 1) { 3314 if ($info->{type} & 1) {
2881 # prepend meta info 3315 # prepend meta info
2882 3316
3317 my $meta = $enc->encode ({
3318 name => $name,
3319 %{ $info->{meta} || {} },
3320 });
3321
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3322 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3323 } else {
3324 $data = $info->{data};
3325 }
2885 3326
2886 cf::face::set_data $idx, 0, $data, $chk; 3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type};
2887 } else { 3329 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3330 $RESOURCE{$name} = $info;
2889 } 3331 }
2890 3332
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3333 cf::cede_to_tick;
2894 } 3334 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3335 }
3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3338
2915 1 3339 1
2916} 3340}
3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
2917 3361
2918register_exticmd fx_want => sub { 3362register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3363 my ($ns, $want) = @_;
2920 3364
2921 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
2923 } 3367 }
2924}; 3368};
2925 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
2926sub reload_regions { 3380sub reload_regions {
3381 # HACK to clear player env face cache, we need some signal framework
3382 # for this (global event?)
3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3384
2927 load_resource_file "$MAPDIR/regions" 3385 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3386 or die "unable to load regions file\n";
2929 3387
2930 for (cf::region::list) { 3388 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3389 $_->{match} = qr/$_->{match}/
2939} 3397}
2940 3398
2941sub reload_archetypes { 3399sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3402}
2950 3403
2951sub reload_treasures { 3404sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
2954} 3407}
2955 3408
2956sub reload_resources { 3409sub reload_resources {
2957 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
2958 3411
3412 reload_facedata;
3413 reload_archetypes;
2959 reload_regions; 3414 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3415 reload_treasures;
2964 3416
2965 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
2966} 3418}
2967 3419
2968sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
2969 reload_resources; 3425 reload_resources;
2970} 3426}
2971 3427
2972sub cfg_load { 3428sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3430 or return;
2975 3431
2976 local $/; 3432 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
2978 3434
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3436
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2993sub main { 3449sub main {
2994 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3453 (async {
2998 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3000 }; 3457 };
3001 3458
3002 cfg_load; 3459 {
3460 my $guard = freeze_mainloop;
3461 reload_config;
3003 db_init; 3462 db_init;
3004 load_extensions; 3463 load_extensions;
3005 3464
3006 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3007 Event::loop; 3468 EV::loop;
3008} 3469}
3009 3470
3010############################################################################# 3471#############################################################################
3011# initialisation and cleanup 3472# initialisation and cleanup
3012 3473
3013# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
3014BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3023 },
3024 ); 3480 };
3025 } 3481 }
3026} 3482}
3027 3483
3028sub write_runtime { 3484sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3030 3486
3031 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3033 3489
3059 and return; 3515 and return;
3060 3516
3061 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3062 3518
3063 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3064} 3563}
3065 3564
3066sub emergency_save() { 3565sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3068 3567
3074 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3579 $pl->save;
3080 } 3580 }
3081 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
3082 3582
3083 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
3089 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3090 3590
3091 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3094 }; 3598 };
3095 3599
3096 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3097} 3601}
3098 3602
3100 my ($make_core) = @_; 3604 my ($make_core) = @_;
3101 3605
3102 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3103 if $make_core; 3607 if $make_core;
3104} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3105 3637
3106sub do_reload_perl() { 3638sub do_reload_perl() {
3107 # can/must only be called in main 3639 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3109 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3110 return; 3642 return;
3111 } 3643 }
3112 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3113 warn "reloading..."; 3648 warn "reloading...";
3114 3649
3115 warn "entering sync_job"; 3650 warn "entering sync_job";
3116 3651
3117 cf::sync_job { 3652 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3654 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3121 3656
3122 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3659
3125 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3126 3661
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3138 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = ();
3146
3147 warn "removing commands";
3148 %COMMAND = ();
3149
3150 warn "removing ext/exti commands";
3151 %EXTCMD = ();
3152 %EXTICMD = ();
3153
3154 warn "unloading/nuking all extensions";
3155 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg";
3157
3158 if (my $cb = $pkg->can ("unload")) {
3159 eval {
3160 $cb->($pkg);
3161 1
3162 } or warn "$pkg unloaded, but with errors: $@";
3163 } 3665 }
3164 3666
3165 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3166 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3167 } 3669 %EXT_CORO = ();
3168 3670
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3170 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3173 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3174 delete $INC{$k};
3175 3681
3176 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g;
3178
3179 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3180 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3181 } 3691 }
3182 3692
3183 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3184 } 3708 }
3185 3709
3186 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3189 3713
3190 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3193 3717
3194 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3195 # and global variables created in xs 3719 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3197 3721
3198 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3199 3723
3200 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3201 require cf; 3725 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3727
3204 warn "loading config and database again"; 3728 warn "loading config and database again";
3205 cf::cfg_load; 3729 cf::reload_config;
3206 3730
3207 warn "loading extensions"; 3731 warn "loading extensions";
3208 cf::load_extensions; 3732 cf::load_extensions;
3209 3733
3210 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3213 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3216 3740
3217 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3218 3742
3219 1 3743 1
3220 } or do { 3744 } or do {
3221 warn $@; 3745 warn $@;
3222 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3747 };
3225 3748
3226 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3227}; 3752};
3228 3753
3229our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3230 3755
3231sub reload_perl() { 3756sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3234 3759
3235 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3236 reentrant => 0,
3237 after => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => sub {
3240 do_reload_perl; 3761 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3242 },
3243 ); 3763 };
3244} 3764}
3245 3765
3246register_command "reload" => sub { 3766register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3248 3768
3249 if ($who->flag (FLAG_WIZ)) { 3769 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3770 $who->message ("reloading server.");
3771 async {
3772 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3773 reload_perl;
3774 };
3252 } 3775 }
3253}; 3776};
3254 3777
3255unshift @INC, $LIBDIR; 3778unshift @INC, $LIBDIR;
3256 3779
3258 3781
3259our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3261 3784
3262sub wait_for_tick { 3785sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3787
3266 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3790 $signal->wait;
3269} 3791}
3270 3792
3271sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3795
3275 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3798 $signal->wait;
3278} 3799}
3279 3800
3280 my $min = 1e6;#d# 3801sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3292 return; 3805 return;
3293 } 3806 }
3294 3807
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3298 3809
3299 0 && sync_job {#d# 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3812 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3813 $Coro::current->{desc} = "runtime saver";
3303 or die; 3814 write_runtime_sync
3304 3815 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3816 };
3817 }
3321 3818
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3820 $sig->send;
3338 } 3821 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3823 $sig->send;
3341 } 3824 }
3342 3825
3343 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3828
3354 _post_tick; 3829 if (0) {
3355 3830 if ($NEXT_TICK) {
3356 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3357 }, 3835 }
3358); 3836}
3359 3837
3360{ 3838{
3361 BDB::max_poll_time $TICK * 0.1; 3839 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3840
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3371 3842 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3843 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3844
3387 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3852
3390 cf::sync_job { 3853 cf::sync_job {
3391 eval { 3854 eval {
3392 BDB::db_env_open 3855 BDB::db_env_open
3393 $DB_ENV, 3856 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3858 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3859 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3860 0666;
3398 3861
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3862 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3863 };
3404 3864
3405 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3866 };
3407 } 3867 }
3868
3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3871 };
3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3874 };
3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3877 };
3408} 3878}
3409 3879
3410{ 3880{
3881 # configure IO::AIO
3882
3411 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3886}
3424 3887
3425my $_log_backtrace; 3888my $_log_backtrace;
3426 3889
3427sub _log_backtrace { 3890sub _log_backtrace {
3431 3894
3432 # limit the # of concurrent backtraces 3895 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3896 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3897 ++$_log_backtrace;
3435 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3436 my @bt = fork_call { 3901 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3905 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines