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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
272Wait until the given lock is available and then acquires it and returns 307Wait 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, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
275returned. 310returned.
276 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
277Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
279 317
280=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
281 319
282Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
283 321
284=cut 322=cut
285 323
286our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
287 326
288sub lock_wait($) { 327sub lock_wait($) {
289 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
290 334
291 # wait for lock, if any 335 # wait for lock, if any
292 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 338 Coro::schedule;
300 344
301 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
302 lock_wait $key; 346 lock_wait $key;
303 347
304 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
305 350
306 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
309 } 355 }
310} 356}
311 357
314 360
315 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
316} 362}
317 363
318sub freeze_mainloop { 364sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
320 366
321 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 368}
323 }; 369
324 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
325 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
326} 383}
327 384
328=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
329 386
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 398our @SLOT_QUEUE;
342our $SLOT_QUEUE; 399our $SLOT_QUEUE;
343 400
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
346 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
347 406
348 while () { 407 while () {
349 next_job: 408 next_job:
350 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
358 } 417 }
359 } 418 }
360 } 419 }
361 420
362 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 424 $signal->wait;
366 } else { 425 } else {
367 Coro::schedule; 426 Coro::schedule;
368 } 427 }
391 450
392BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
393 452
394=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
395 454
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 456is 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 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 458acceptable.
400 459
401If it must be done, put the blocking parts into C<sync_job>. This will run 460If 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 461the given BLOCK in another coroutine while waiting for the result. The
407 466
408sub sync_job(&) { 467sub sync_job(&) {
409 my ($job) = @_; 468 my ($job) = @_;
410 469
411 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 471 my $time = EV::time;
413 472
414 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
416 475
417 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 477
419 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
420 479
421 my $busy = 1; 480 my $busy = 1;
422 my @res; 481 my @res;
423 482
424 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 485 @res = eval { $job->() };
426 warn $@ if $@; 486 warn $@ if $@;
427 undef $busy; 487 undef $busy;
428 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
429 489
430 while ($busy) { 490 while ($busy) {
431 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
432 } 495 }
496 }
433 497
434 $time = Event::time - $time; 498 my $time = EV::time - $time;
435 499
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 500 $TICK_START += $time; # do not account sync jobs to server load
440 501
441 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
442 } else { 503 } else {
443 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
444 505
469=item fork_call { }, $args 530=item fork_call { }, $args
470 531
471Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
475 536
476=cut 537=cut
477 538
478sub fork_call(&@) { 539sub fork_call(&@) {
479 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
480 541
481 # we seemingly have to make a local copy of the whole thing, 542 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 543 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 544 # TODO: investigate and fix (likely this will be rather laborious)
484 545
485 my @res = Coro::Util::fork_eval { 546 my @res = Coro::Util::fork_eval {
486 reset_signals; 547 reset_signals;
487 &$cb 548 &$cb
488 }, @args; 549 }, @args;
489 550
490 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
491} 552}
492 553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
579}
580
493=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
494 582
495Returns a single value from the environment database. 583Returns a single value from the environment database.
496 584
497=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
498 586
499Stores the given C<$value> in the family. It can currently store binary 587Stores 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). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
502=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
503 613
504our $DB; 614our $DB;
505 615
506sub db_init { 616sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 617 cf::sync_job {
511 eval { 618 $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 } 619 };
521} 620}
522 621
523sub db_get($$) { 622sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
525 624
575 if (1) { 674 if (1) {
576 $md5 = 675 $md5 =
577 join "\x00", 676 join "\x00",
578 $processversion, 677 $processversion,
579 map { 678 map {
580 Coro::cede; 679 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 681 } 0.. $#$src;
583 682
584 683
585 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
631 730
632In the following description, CLASS can be any of C<global>, C<object> 731In 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 732C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 733Deliantra).
635 734
636=over 4 735=over 4
637 736
638=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
639 738
921 } 1020 }
922 1021
923 0 1022 0
924} 1023}
925 1024
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1026
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1028
930Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
931 1030
937 1036
938=cut 1037=cut
939 1038
940############################################################################# 1039#############################################################################
941# object support 1040# object support
942#
943 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
944sub _can_merge { 1075sub _can_merge {
945 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
946 1077
947 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1079
951 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
952} 1082}
953 1083
954sub reattach { 1084sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1086 my ($obj) = @_;
978cf::attachable->attach ( 1108cf::attachable->attach (
979 prio => -1000000, 1109 prio => -1000000,
980 on_instantiate => sub { 1110 on_instantiate => sub {
981 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
982 1112
983 $data = from_json $data; 1113 $data = decode_json $data;
984 1114
985 for (@$data) { 1115 for (@$data) {
986 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
987 1117
988 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1134sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1006 1136
1007 sync_job { 1137 sync_job {
1008 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1011 1142
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1147 close $fh;
1017 1148
1018 if (@$objs) { 1149 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1155 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1157 }
1034 } 1165 }
1035 } else { 1166 } else {
1036 aio_unlink $filename; 1167 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1038 } 1169 }
1039 } 1170 };
1040} 1171}
1041 1172
1042sub object_freezer_as_string { 1173sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1044 1175
1056 or return; 1187 or return;
1057 1188
1058 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1191 or return;
1192
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1062 } 1195 }
1063 1196
1197 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1066 return ($data, $av); 1201 ($data, $av)
1067} 1202}
1068 1203
1069=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1070 1205
1071=over 4 1206=over 4
1149 my ($type, $reply, @payload) = 1284 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1285 "ARRAY" eq ref $msg
1151 ? @$msg 1286 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1288
1289 my @reply;
1290
1154 if (my $cb = $EXTCMD{$type}) { 1291 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1292 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1160 } else { 1298 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1300 }
1163 1301
1164 cf::override; 1302 cf::override;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1219 1357
1220 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1359 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1361 }
1225 1362
1226 warn $msg; 1363 warn $msg;
1227 } 1364 }
1228 1365
1253use Coro::AIO; 1390use Coro::AIO;
1254 1391
1255=head3 cf::player 1392=head3 cf::player
1256 1393
1257=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1258 1409
1259=item cf::player::find $login 1410=item cf::player::find $login
1260 1411
1261Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1262 1413
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1453
1303 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1306 } 1462 }
1307 } 1463 }
1308} 1464}
1309 1465
1319 1475
1320 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1322 1478
1323 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1324 Coro::cede; 1480 cf::cede_to_tick;
1325} 1481}
1326 1482
1327sub new($) { 1483sub new($) {
1328 my ($login) = @_; 1484 my ($login) = @_;
1329 1485
1407 or return []; 1563 or return [];
1408 1564
1409 my @logins; 1565 my @logins;
1410 1566
1411 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1415 1576
1416 utf8::decode $login; 1577 utf8::decode $login;
1417 push @logins, $login; 1578 push @logins, $login;
1418 } 1579 }
1419 1580
1452 1613
1453Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1454 1615
1455=cut 1616=cut
1456 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1457sub expand_cfpod { 1629sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1459 1631
1460 # escape & and < 1632 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1633
1464 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1465 1637
1466 1 while 1638 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1643 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1473 $self->gender ? $2 : $1 1645 (?:
1474 }ge 1646 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1647 | < $interior >
1476 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1477 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1671 "")
1481 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1483 1683
1684 for ($xml) {
1484 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1486 1687
1487 # compress some whitespace 1688 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1492 1694
1493 $_ 1695 $xml
1494} 1696}
1697
1698no re 'eval';
1495 1699
1496sub hintmode { 1700sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1702 $_[0]{hintmode}
1499} 1703}
1571our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1572our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1573 1777
1574sub generate_random_map { 1778sub generate_random_map {
1575 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1576 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1577 $self->_create_random_map ( 1784 $self->_create_random_map (
1578 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1579 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1580 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1702 1909
1703# the temporary/swap location 1910# the temporary/swap location
1704sub save_path { 1911sub save_path {
1705 my ($self) = @_; 1912 my ($self) = @_;
1706 1913
1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1708 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1709} 1916}
1710 1917
1711# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1712sub uniq_path { 1919sub uniq_path {
1713 my ($self) = @_; 1920 my ($self) = @_;
1714 1921
1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1716 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1717} 1924}
1718 1925
1719# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1720# all maps in C++... 1927# all maps in C++...
1743 1950
1744sub load_header_from($) { 1951sub load_header_from($) {
1745 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1746 1953
1747 utf8::encode $path; 1954 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1956 or return;
1957
1958 $self->_load_header ($f)
1959 or return;
1960
1961 local $MAP_LOADING{$self->{path}} = $self;
1962 $f->resolve_delayed_derefs;
1753 1963
1754 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1755 1965
1756 1 1966 1
1757} 1967}
1811sub find { 2021sub find {
1812 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1813 2023
1814 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1815 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1817 2028
1818 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1820 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1821 or return; 2034 or return;
1822 2035
1823 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1824 2037
1826 or return; 2039 or return;
1827 2040
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1831 $map->reset; 2046 $map->reset;
1832 undef $guard;
1833 return find $path; 2047 return find $path;
1834 } 2048 }
1835 2049
1836 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1837 } 2051 }
1846 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1847 2061
1848 my $path = $self->{path}; 2062 my $path = $self->{path};
1849 2063
1850 { 2064 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1852 2066
2067 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2069
1855 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1856 2071
1857 $self->alloc; 2072 $self->alloc;
1858 2073
1859 $self->pre_load; 2074 $self->pre_load;
1860 Coro::cede; 2075 cf::cede_to_tick;
1861 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1863 or return; 2080 or return;
1864 2081
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1867 2084
1868 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2086 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2089 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1873 } 2093 }
1874 } 2094 }
1875 2095
1876 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1877 # now do the right thing for maps 2099 # now do the right thing for maps
1878 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2102 unless $self->difficulty;
1881 Coro::cede; 2103 cf::cede_to_tick;
1882 2104
1883 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2106 $self->decay_objects;
1885 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1886 $self->update_buttons; 2108 $self->update_buttons;
1887 Coro::cede; 2109 cf::cede_to_tick;
1888 $self->set_darkness_map; 2110 $self->set_darkness_map;
1889 Coro::cede; 2111 cf::cede_to_tick;
1890 $self->activate; 2112 $self->activate;
1891 } 2113 }
1892 2114
1893 $self->{last_save} = $cf::RUNTIME; 2115 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2116 $self->last_access ($cf::RUNTIME);
1944} 2166}
1945 2167
1946sub do_load_sync { 2168sub do_load_sync {
1947 my ($map) = @_; 2169 my ($map) = @_;
1948 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1949 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1950} 2175}
1951 2176
1952our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1954 2179
1955sub find_async { 2180sub find_async {
1956 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1957 2182
1958 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
1959 2184
1960 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2187 }
1963 2188
1964 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
1965 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1966 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2196 if (my $map = find $k) {
1969 $map->load; 2197 $map->load if $v;
1970 } 2198 }
1971 2199
1972 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
1973 } 2201 }
1974 } 2202 }
1975 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
1976 }; 2204 };
1977 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
1980} 2208}
1981 2209
1982sub save { 2210sub save {
1983 my ($self) = @_; 2211 my ($self) = @_;
1984 2212
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2214
1987 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
1988 2216
1989 return unless $self->dirty; 2217 return unless $self->dirty;
1990 2218
1996 return if $self->{deny_save}; 2224 return if $self->{deny_save};
1997 2225
1998 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
1999 2227
2000 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2002 }; 2231 };
2003 2232
2004 if ($uniq) { 2233 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 my ($self) = @_; 2242 my ($self) = @_;
2014 2243
2015 # save first because save cedes 2244 # save first because save cedes
2016 $self->save; 2245 $self->save;
2017 2246
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2248
2020 return if $self->players; 2249 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2251 return if $self->{deny_save};
2023 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2257 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2258}
2027 2259
2028sub reset_at { 2260sub reset_at {
2029 my ($self) = @_; 2261 my ($self) = @_;
2030 2262
2062 if $uniq; 2294 if $uniq;
2063 } 2295 }
2064 2296
2065 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2066 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2301 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2302
2071 $self->unlink_save; 2303 $self->unlink_save;
2072 $self->destroy; 2304 $self->destroy;
2073} 2305}
2074 2306
2075my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
2076 2308
2077sub nuke { 2309sub nuke {
2078 my ($self) = @_; 2310 my ($self) = @_;
2079 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2080 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2081 2316
2082 $self->unlink_save; 2317 $self->unlink_save;
2083 2318
2084 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2324
2090 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2091 2327
2092 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2093} 2329}
2094 2330
2095=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2137 2373
2138sub unique_maps() { 2374sub unique_maps() {
2139 [ 2375 [
2140 map { 2376 map {
2141 utf8::decode $_; 2377 utf8::decode $_;
2142 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2143 ? normalise $_ 2381 : normalise $_
2144 : ()
2145 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2146 ] 2383 ]
2147} 2384}
2148 2385
2149package cf;
2150
2151=back 2386=back
2152 2387
2153=head3 cf::object 2388=head3 cf::object
2154 2389
2155=cut 2390=cut
2158 2393
2159=over 4 2394=over 4
2160 2395
2161=item $ob->inv_recursive 2396=item $ob->inv_recursive
2162 2397
2163Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2164 2400
2165=cut 2401=cut
2166 2402
2167sub inv_recursive_; 2403sub inv_recursive_;
2168sub inv_recursive_ { 2404sub inv_recursive_ {
2169 map { $_, inv_recursive_ $_->inv } @_ 2405 map { $_, inv_recursive_ $_->inv } @_
2170} 2406}
2171 2407
2172sub inv_recursive { 2408sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2410}
2411
2412=item $ref = $ob->ref
2413
2414Creates and returns a persistent reference to an object that can be stored as a string.
2415
2416=item $ob = cf::object::deref ($refstring)
2417
2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2419even if the object actually exists. May block.
2420
2421=cut
2422
2423sub deref {
2424 my ($ref) = @_;
2425
2426 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2427 my ($uuid, $name) = ($1, $2);
2428 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2429 or return;
2430 $pl->ob->uuid eq $uuid
2431 or return;
2432
2433 $pl->ob
2434 } else {
2435 warn "$ref: cannot resolve object reference\n";
2436 undef
2437 }
2174} 2438}
2175 2439
2176package cf; 2440package cf;
2177 2441
2178=back 2442=back
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2602 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2603
2340 $self->enter_link; 2604 $self->enter_link;
2341 2605
2342 (async { 2606 (async {
2607 $Coro::current->{desc} = "player::goto $path $x $y";
2608
2609 # *tag paths override both path and x|y
2610 if ($path =~ /^\*(.*)$/) {
2611 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2612 my $ob = $obs[rand @obs];
2613
2614 # see if we actually can go there
2615 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2616 $ob = $obs[rand @obs];
2617 } else {
2618 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2619 }
2620 # else put us there anyways for now #d#
2621
2622 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2623 } else {
2624 ($path, $x, $y) = (undef, undef, undef);
2625 }
2626 }
2627
2343 my $map = eval { 2628 my $map = eval {
2344 my $map = cf::map::find $path; 2629 my $map = defined $path ? cf::map::find $path : undef;
2345 2630
2346 if ($map) { 2631 if ($map) {
2347 $map = $map->customise_for ($self); 2632 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2633 $map = $check->($map) if $check && $map;
2349 } else { 2634 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2635 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2636 }
2352 2637
2353 $map 2638 $map
2354 }; 2639 };
2355 2640
2408 $rmp->{origin_y} = $exit->y; 2693 $rmp->{origin_y} = $exit->y;
2409 } 2694 }
2410 2695
2411 $rmp->{random_seed} ||= $exit->random_seed; 2696 $rmp->{random_seed} ||= $exit->random_seed;
2412 2697
2413 my $data = cf::to_json $rmp; 2698 my $data = cf::encode_json $rmp;
2414 my $md5 = Digest::MD5::md5_hex $data; 2699 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2700 my $meta = "$RANDOMDIR/$md5.meta";
2416 2701
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2703 aio_write $fh, 0, (length $data), $data, 0;
2445 # if exit is damned, update players death & WoR home-position 2730 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2731 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2732 if $exit->flag (FLAG_DAMNED);
2448 2733
2449 (async { 2734 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2736
2450 $self->deactivate_recursive; # just to be sure 2737 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2738 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2739 $self->goto ($slaying, $hp, $sp);
2453 2740
2454 1; 2741 1;
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2776the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2777the message unless the client supports the msg packet.
2491 2778
2492=cut 2779=cut
2493 2780
2781# non-persistent channels (usually the info channel)
2782our %CHANNEL = (
2783 "c/identify" => {
2784 id => "infobox",
2785 title => "Identify",
2786 reply => undef,
2787 tooltip => "Items recently identified",
2788 },
2789 "c/examine" => {
2790 id => "infobox",
2791 title => "Examine",
2792 reply => undef,
2793 tooltip => "Signs and other items you examined",
2794 },
2795 "c/book" => {
2796 id => "infobox",
2797 title => "Book",
2798 reply => undef,
2799 tooltip => "The contents of a note or book",
2800 },
2801 "c/lookat" => {
2802 id => "infobox",
2803 title => "Look",
2804 reply => undef,
2805 tooltip => "What you saw there",
2806 },
2807 "c/who" => {
2808 id => "infobox",
2809 title => "Players",
2810 reply => undef,
2811 tooltip => "Shows players who are currently online",
2812 },
2813 "c/body" => {
2814 id => "infobox",
2815 title => "Body Parts",
2816 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831);
2832
2494sub cf::client::send_msg { 2833sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2834 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2835
2497 $msg = $self->pl->expand_cfpod ($msg); 2836 $msg = $self->pl->expand_cfpod ($msg);
2498 2837
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2838 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2839
2840 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel};
2843
2844 $self->ext_msg (channel_info => $channel)
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id};
2848
2501 if (ref $channel) { 2849 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2850 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2851 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2852 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2853 $self->ext_msg (channel_info => $channel)
2854 if $self->can_msg;
2506 } 2855 }
2507 2856
2508 $channel = $channel->{id}; 2857 $channel = $channel->{id};
2509 } 2858 }
2510 2859
2551=cut 2900=cut
2552 2901
2553sub cf::client::ext_msg($$@) { 2902sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2903 my ($self, $type, @msg) = @_;
2555 2904
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2905 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2906 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2907 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2908 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2909 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2910 }
2564} 2911}
2565 2912
2572sub cf::client::ext_reply($$@) { 2919sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2920 my ($self, $id, @msg) = @_;
2574 2921
2575 if ($self->extcmd == 2) { 2922 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2923 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2924 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2925 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2926 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2927 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2928 }
2582} 2929}
2646 my ($type, $reply, @payload) = 2993 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2994 "ARRAY" eq ref $msg
2648 ? @$msg 2995 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2996 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2997
2998 my @reply;
2999
2651 if (my $cb = $EXTICMD{$type}) { 3000 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3001 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3002 }
3003
3004 $ns->ext_reply ($reply, @reply)
3005 if $reply;
3006
2657 } else { 3007 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3008 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3009 }
2660 3010
2661 cf::override; 3011 cf::override;
2721=pod 3071=pod
2722 3072
2723The following functions and methods are available within a safe environment: 3073The following functions and methods are available within a safe environment:
2724 3074
2725 cf::object 3075 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3076 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3077 insert remove name archname title slaying race decrease_ob_nr
2728 3078
2729 cf::object::player 3079 cf::object::player
2730 player 3080 player
2731 3081
2732 cf::player 3082 cf::player
2737 3087
2738=cut 3088=cut
2739 3089
2740for ( 3090for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3092 insert remove inv name archname title slaying race
3093 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 3094 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3095 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 3096 ["cf::map" => qw(trigger)],
2746) { 3097) {
2747 no strict 'refs'; 3098 no strict 'refs';
2823# the server's init and main functions 3174# the server's init and main functions
2824 3175
2825sub load_facedata($) { 3176sub load_facedata($) {
2826 my ($path) = @_; 3177 my ($path) = @_;
2827 3178
3179 # HACK to clear player env face cache, we need some signal framework
3180 # for this (global event?)
3181 %ext::player_env::MUSIC_FACE_CACHE = ();
3182
2828 my $enc = JSON::XS->new->utf8->canonical; 3183 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3184
2830 warn "loading facedata from $path\n"; 3185 warn "loading facedata from $path\n";
2831 3186
2832 my $facedata; 3187 my $facedata;
2833 0 < aio_load $path, $facedata 3188 0 < aio_load $path, $facedata
2848 { 3203 {
2849 my $faces = $facedata->{faceinfo}; 3204 my $faces = $facedata->{faceinfo};
2850 3205
2851 while (my ($face, $info) = each %$faces) { 3206 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3207 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208
2853 cf::face::set_visibility $idx, $info->{visibility}; 3209 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3210 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857 3213
2858 cf::cede_to_tick; 3214 cf::cede_to_tick;
2859 } 3215 }
2860 3216
2861 while (my ($face, $info) = each %$faces) { 3217 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3218 next unless $info->{smooth};
3219
2863 my $idx = cf::face::find $face 3220 my $idx = cf::face::find $face
2864 or next; 3221 or next;
3222
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3223 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3224 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3226 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3227 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 { 3245 {
2888 # TODO: for gcfclient pleasure, we should give resources 3246 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index. 3247 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3248 my $res = $facedata->{resource};
2891 3249
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3250 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3252 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data; 3253 my $data;
2897 3254
2898 if ($info->{type} & 1) { 3255 if ($info->{type} & 1) {
2899 # prepend meta info 3256 # prepend meta info
2900 3257
2901 my $meta = $enc->encode ({ 3258 my $meta = $enc->encode ({
2902 name => $name, 3259 name => $name,
2903 %{ $info->{meta} || {} }, 3260 %{ $info->{meta} || {} },
2904 }); 3261 });
2905 3262
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type};
2907 } else { 3270 } else {
2908 $data = $info->{data}; 3271 $RESOURCE{$name} = $info;
2909 } 3272 }
2910 3273
2911 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912 cf::face::set_type $idx, $info->{type};
2913
2914 cf::cede_to_tick; 3274 cf::cede_to_tick;
2915 } 3275 }
2916
2917 if ($soundconf) {
2918 $soundconf = $enc->decode (delete $soundconf->{data});
2919
2920 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921 my $sound = $soundconf->{compat}[$_]
2922 or next;
2923
2924 my $face = cf::face::find "sound/$sound->[1]";
2925 cf::sound::set $sound->[0] => $face;
2926 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927 }
2928
2929 while (my ($k, $v) = each %{$soundconf->{event}}) {
2930 my $face = cf::face::find "sound/$v";
2931 cf::sound::set $k => $face;
2932 }
2933 }
2934 } 3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2935 3279
2936 1 3280 1
2937} 3281}
3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
2938 3302
2939register_exticmd fx_want => sub { 3303register_exticmd fx_want => sub {
2940 my ($ns, $want) = @_; 3304 my ($ns, $want) = @_;
2941 3305
2942 while (my ($k, $v) = each %$want) { 3306 while (my ($k, $v) = each %$want) {
2943 $ns->fx_want ($k, $v); 3307 $ns->fx_want ($k, $v);
2944 } 3308 }
2945}; 3309};
2946 3310
2947sub reload_regions { 3311sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = ();
3315
2948 load_resource_file "$MAPDIR/regions" 3316 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3317 or die "unable to load regions file\n";
2950 3318
2951 for (cf::region::list) { 3319 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3320 $_->{match} = qr/$_->{match}/
2988 3356
2989sub init { 3357sub init {
2990 reload_resources; 3358 reload_resources;
2991} 3359}
2992 3360
2993sub cfg_load { 3361sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3363 or return;
2996 3364
2997 local $/; 3365 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
2999 3367
3000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3001 3369
3002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3014sub main { 3382sub main {
3015 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3386 (async {
3019 Event::one_event; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT;
3020 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3021 }; 3390 };
3022 3391
3023 cfg_load; 3392 reload_config;
3024 db_init; 3393 db_init;
3025 load_extensions; 3394 load_extensions;
3026 3395
3027 $TICK_WATCHER->start; 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
3028 Event::loop; 3398 EV::loop;
3029} 3399}
3030 3400
3031############################################################################# 3401#############################################################################
3032# initialisation and cleanup 3402# initialisation and cleanup
3033 3403
3034# install some emergency cleanup handlers 3404# install some emergency cleanup handlers
3035BEGIN { 3405BEGIN {
3406 our %SIGWATCHER = ();
3036 for my $signal (qw(INT HUP TERM)) { 3407 for my $signal (qw(INT HUP TERM)) {
3037 Event->signal ( 3408 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3038 reentrant => 0,
3039 data => WF_AUTOCANCEL,
3040 signal => $signal,
3041 prio => 0,
3042 cb => sub {
3043 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3044 },
3045 ); 3410 };
3046 } 3411 }
3047} 3412}
3048 3413
3049sub write_runtime { 3414sub write_runtime_sync {
3050 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3051 3416
3052 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3053 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3054 3419
3080 and return; 3445 and return;
3081 3446
3082 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3083 3448
3084 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
3085} 3493}
3086 3494
3087sub emergency_save() { 3495sub emergency_save() {
3088 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3089 3497
3095 # and maps saved/destroyed asynchronously. 3503 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3504 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3505 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3506 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3507 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3509 $pl->save;
3101 } 3510 }
3102 warn "end emergency player save\n"; 3511 warn "end emergency player save\n";
3103 3512
3104 warn "begin emergency map save\n"; 3513 warn "begin emergency map save\n";
3110 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3111 3520
3112 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3113 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3114 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
3115 }; 3528 };
3116 3529
3117 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3118} 3531}
3119 3532
3134 warn "reloading..."; 3547 warn "reloading...";
3135 3548
3136 warn "entering sync_job"; 3549 warn "entering sync_job";
3137 3550
3138 cf::sync_job { 3551 cf::sync_job {
3139 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3140 cf::emergency_save; 3553 cf::emergency_save;
3141 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3142 3555
3143 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3144 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3145 3558
3146 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
3147
3148 warn "cancelling all WF_AUTOCANCEL watchers";
3149 for (Event::all_watchers) {
3150 $_->cancel if $_->data & WF_AUTOCANCEL;
3151 }
3152 3560
3153 warn "flushing outstanding aio requests"; 3561 warn "flushing outstanding aio requests";
3154 for (;;) { 3562 for (;;) {
3155 BDB::flush; 3563 BDB::flush;
3156 IO::AIO::flush; 3564 IO::AIO::flush;
3157 Coro::cede; 3565 Coro::cede_notself;
3158 last unless IO::AIO::nreqs || BDB::nreqs; 3566 last unless IO::AIO::nreqs || BDB::nreqs;
3159 warn "iterate..."; 3567 warn "iterate...";
3160 } 3568 }
3161 3569
3162 ++$RELOAD; 3570 ++$RELOAD;
3221 warn "reloading cf.pm"; 3629 warn "reloading cf.pm";
3222 require cf; 3630 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3632
3225 warn "loading config and database again"; 3633 warn "loading config and database again";
3226 cf::cfg_load; 3634 cf::reload_config;
3227 3635
3228 warn "loading extensions"; 3636 warn "loading extensions";
3229 cf::load_extensions; 3637 cf::load_extensions;
3230 3638
3231 warn "reattaching attachments to objects/players"; 3639 warn "reattaching attachments to objects/players";
3238 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3239 3647
3240 1 3648 1
3241 } or do { 3649 } or do {
3242 warn $@; 3650 warn $@;
3243 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3244 exit 1;
3245 }; 3652 };
3246 3653
3247 warn "reloaded"; 3654 warn "reloaded";
3248}; 3655};
3249 3656
3251 3658
3252sub reload_perl() { 3659sub reload_perl() {
3253 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3254 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3255 3662
3256 $RELOAD_WATCHER ||= Event->timer ( 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3257 reentrant => 0,
3258 after => 0,
3259 data => WF_AUTOCANCEL,
3260 cb => sub {
3261 do_reload_perl; 3664 do_reload_perl;
3262 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3263 },
3264 ); 3666 };
3265} 3667}
3266 3668
3267register_command "reload" => sub { 3669register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
3269 3671
3270 if ($who->flag (FLAG_WIZ)) { 3672 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3673 $who->message ("reloading server.");
3674 async {
3675 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3676 reload_perl;
3677 };
3273 } 3678 }
3274}; 3679};
3275 3680
3276unshift @INC, $LIBDIR; 3681unshift @INC, $LIBDIR;
3277 3682
3279 3684
3280our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3281our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3282 3687
3283sub wait_for_tick { 3688sub wait_for_tick {
3284 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3285 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3286 3691
3287 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3288 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3289 $signal->wait; 3694 $signal->wait;
3290} 3695}
3291 3696
3292sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3293 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3294 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3295 3700
3296 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3703 $signal->wait;
3299} 3704}
3300 3705
3301 my $min = 1e6;#d# 3706sub tick {
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer (
3304 reentrant => 0,
3305 parked => 1,
3306 prio => 0,
3307 at => $NEXT_TICK || $TICK,
3308 data => WF_AUTOCANCEL,
3309 cb => sub {
3310 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3311 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3708 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3312 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3313 return; 3710 return;
3314 } 3711 }
3315 3712
3316 $NOW = $tick_start = Event::time;
3317
3318 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3319 3714
3320 0 && sync_job {#d# 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3321 for(1..10) { 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3322 my $t = Event::time; 3717 Coro::async_pool {
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3718 $Coro::current->{desc} = "runtime saver";
3324 or die; 3719 write_runtime_sync
3325 3720 or warn "ERROR: unable to write runtime file: $!";
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 }; 3721 };
3722 }
3342 3723
3343 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK;
3345
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool {
3349 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!";
3351 };
3352 }
3353
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3725 $sig->send;
3359 } 3726 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3728 $sig->send;
3362 } 3729 }
3363 3730
3364 $NOW = Event::time; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3365
3366 # if we are delayed by four ticks or more, skip them all
3367 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3368
3369 $TICK_WATCHER->at ($NEXT_TICK);
3370 $TICK_WATCHER->start;
3371
3372 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3733
3375 _post_tick; 3734 if (0) {
3376 3735 if ($NEXT_TICK) {
3377 3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3378 }, 3740 }
3379); 3741}
3380 3742
3381{ 3743{
3382 BDB::max_poll_time $TICK * 0.1; 3744 # configure BDB
3383 $BDB_POLL_WATCHER = Event->io ( 3745
3384 reentrant => 0,
3385 fd => BDB::poll_fileno,
3386 poll => 'r',
3387 prio => 0,
3388 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb,
3390 );
3391 BDB::min_parallel 8; 3746 BDB::min_parallel 8;
3392 3747 BDB::max_poll_reqs $TICK * 0.1;
3393 BDB::set_sync_prepare { 3748 $Coro::BDB::WATCHER->priority (1);
3394 my $status;
3395 my $current = $Coro::current;
3396 (
3397 sub {
3398 $status = $!;
3399 $current->ready; undef $current;
3400 },
3401 sub {
3402 Coro::schedule while defined $current;
3403 $! = $status;
3404 },
3405 )
3406 };
3407 3749
3408 unless ($DB_ENV) { 3750 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3751 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3753 | BDB::LOG_AUTOREMOVE, 1);
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3756
3411 cf::sync_job { 3757 cf::sync_job {
3412 eval { 3758 eval {
3413 BDB::db_env_open 3759 BDB::db_env_open
3414 $DB_ENV, 3760 $DB_ENV,
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3762 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3763 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3764 0666;
3419 3765
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3766 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423 $DB_ENV->set_lk_detect;
3424 }; 3767 };
3425 3768
3426 cf::cleanup "db_env_open(db): $@" if $@; 3769 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3770 };
3428 } 3771 }
3772
3773 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3774 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3775 };
3776 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3777 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3778 };
3779 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3780 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3781 };
3429} 3782}
3430 3783
3431{ 3784{
3785 # configure IO::AIO
3786
3432 IO::AIO::min_parallel 8; 3787 IO::AIO::min_parallel 8;
3433
3434 undef $Coro::AIO::WATCHER;
3435 IO::AIO::max_poll_time $TICK * 0.1; 3788 IO::AIO::max_poll_time $TICK * 0.1;
3436 $AIO_POLL_WATCHER = Event->io ( 3789 $Coro::AIO::WATCHER->priority (1);
3437 reentrant => 0,
3438 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno,
3440 poll => 'r',
3441 prio => 6,
3442 cb => \&IO::AIO::poll_cb,
3443 );
3444} 3790}
3445 3791
3446my $_log_backtrace; 3792my $_log_backtrace;
3447 3793
3448sub _log_backtrace { 3794sub _log_backtrace {
3452 3798
3453 # limit the # of concurrent backtraces 3799 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3800 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3801 ++$_log_backtrace;
3456 async { 3802 async {
3803 $Coro::current->{desc} = "abt $msg";
3804
3457 my @bt = fork_call { 3805 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3806 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3807 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3808 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3809 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines