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.355 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
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 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
285Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
286 300
287=cut 301=cut
288 302
289our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
290 305
291sub lock_wait($) { 306sub lock_wait($) {
292 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
293 313
294 # wait for lock, if any 314 # wait for lock, if any
295 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 317 Coro::schedule;
303 323
304 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
305 lock_wait $key; 325 lock_wait $key;
306 326
307 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
308 329
309 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
312 } 334 }
313} 335}
314 336
326 }; 348 };
327 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
328 $guard 350 $guard
329} 351}
330 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
331=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
332 369
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
344our @SLOT_QUEUE; 381our @SLOT_QUEUE;
345our $SLOT_QUEUE; 382our $SLOT_QUEUE;
346 383
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
349 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
350 389
351 while () { 390 while () {
352 next_job: 391 next_job:
353 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
361 } 400 }
362 } 401 }
363 } 402 }
364 403
365 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 407 $signal->wait;
369 } else { 408 } else {
370 Coro::schedule; 409 Coro::schedule;
371 } 410 }
394 433
395BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
396 435
397=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
398 437
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 441acceptable.
403 442
404If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
410 449
411sub sync_job(&) { 450sub sync_job(&) {
412 my ($job) = @_; 451 my ($job) = @_;
413 452
414 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 454 my $time = EV::time;
416 455
417 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
419 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
420 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 462 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
423 464
424 my $busy = 1; 465 my $busy = 1;
425 my @res; 466 my @res;
426 467
427 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 470 @res = eval { $job->() };
429 warn $@ if $@; 471 warn $@ if $@;
430 undef $busy; 472 undef $busy;
431 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
432 474
433 while ($busy) { 475 while ($busy) {
434 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
435 } 480 }
481 }
436 482
437 $time = Event::time - $time; 483 $time = EV::time - $time;
438 484
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 487
442 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
472=item fork_call { }, $args 518=item fork_call { }, $args
473 519
474Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
478 524
479=cut 525=cut
480 526
481sub fork_call(&@) { 527sub fork_call(&@) {
482 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
500=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
501 547
502Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
505=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
506 574
507our $DB; 575our $DB;
508 576
509sub db_init { 577sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 578 cf::sync_job {
514 eval { 579 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 580 };
524} 581}
525 582
526sub db_get($$) { 583sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
528 585
632attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
634 691
635In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 694Deliantra).
638 695
639=over 4 696=over 4
640 697
641=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
642 699
924 } 981 }
925 982
926 0 983 0
927} 984}
928 985
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 987
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 989
933Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
934 991
940 997
941=cut 998=cut
942 999
943############################################################################# 1000#############################################################################
944# object support 1001# object support
945#
946 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
947sub _can_merge { 1036sub _can_merge {
948 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
949 1038
950 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1040
954 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
955} 1043}
956 1044
957sub reattach { 1045sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1047 my ($obj) = @_;
981cf::attachable->attach ( 1069cf::attachable->attach (
982 prio => -1000000, 1070 prio => -1000000,
983 on_instantiate => sub { 1071 on_instantiate => sub {
984 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
985 1073
986 $data = from_json $data; 1074 $data = decode_json $data;
987 1075
988 for (@$data) { 1076 for (@$data) {
989 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
990 1078
991 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1095sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1009 1097
1010 sync_job { 1098 sync_job {
1011 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1014 1103
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1108 close $fh;
1020 1109
1021 if (@$objs) { 1110 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1116 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1118 }
1037 } 1126 }
1038 } else { 1127 } else {
1039 aio_unlink $filename; 1128 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1041 } 1130 }
1042 } 1131 };
1043} 1132}
1044 1133
1045sub object_freezer_as_string { 1134sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1047 1136
1059 or return; 1148 or return;
1060 1149
1061 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1152 or return;
1153
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1065 } 1156 }
1066 1157
1158 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1069 return ($data, $av); 1162 ($data, $av)
1070} 1163}
1071 1164
1072=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1073 1166
1074=over 4 1167=over 4
1223 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1225 1318
1226 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1320 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1322 }
1231 1323
1232 warn $msg; 1324 warn $msg;
1233 } 1325 }
1234 1326
1259use Coro::AIO; 1351use Coro::AIO;
1260 1352
1261=head3 cf::player 1353=head3 cf::player
1262 1354
1263=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1264 1370
1265=item cf::player::find $login 1371=item cf::player::find $login
1266 1372
1267Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1268 1374
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1414
1309 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1312 } 1423 }
1313 } 1424 }
1314} 1425}
1315 1426
1463 1574
1464Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1465 1576
1466=cut 1577=cut
1467 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1468sub expand_cfpod { 1590sub expand_cfpod {
1469 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1470 1592
1471 # escape & and < 1593 my $xml;
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474 1594
1475 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1476 1598
1477 1 while 1599 $group =~ s/&/&amp;/g;
1478 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1479 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1480 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1481 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1483 # replace G<male|female> tags 1605 <
1484 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1485 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1486 }ge 1608 | < $interior >
1487 # replace H<hint text> 1609 )
1488 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1489 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "") 1632 "")
1493 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1494 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1495 1644
1645 for ($xml) {
1496 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1498 1648
1499 # compress some whitespace 1649 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1504 1655
1505 $_ 1656 $xml
1506} 1657}
1658
1659no re 'eval';
1507 1660
1508sub hintmode { 1661sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode} 1663 $_[0]{hintmode}
1511} 1664}
1755 1908
1756sub load_header_from($) { 1909sub load_header_from($) {
1757 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1758 1911
1759 utf8::encode $path; 1912 utf8::encode $path;
1760 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1761 # or return;
1762
1763 $self->_load_header ($path)
1764 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1765 1921
1766 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1767 1923
1768 1 1924 1
1769} 1925}
1823sub find { 1979sub find {
1824 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1825 1981
1826 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1827 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1828 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1829 1986
1830 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1831 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1832 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1833 or return; 1992 or return;
1834 1993
1835 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1836 1995
1838 or return; 1997 or return;
1839 1998
1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1841 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1842 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1843 $map->reset; 2004 $map->reset;
1844 undef $guard;
1845 return find $path; 2005 return find $path;
1846 } 2006 }
1847 2007
1848 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1849 } 2009 }
1858 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1859 2019
1860 my $path = $self->{path}; 2020 my $path = $self->{path};
1861 2021
1862 { 2022 {
1863 my $guard1 = cf::lock_acquire "map_data:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1864 my $guard2 = cf::lock_acquire "map_load:$path";
1865 2024
2025 return unless $self->valid;
1866 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1867 2027
1868 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1869 2029
1870 $self->alloc; 2030 $self->alloc;
1871 2031
1872 $self->pre_load; 2032 $self->pre_load;
1873 cf::cede_to_tick; 2033 cf::cede_to_tick;
1874 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1875 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1876 or return; 2038 or return;
1877 2039
1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1879 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1880 2042
1881 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1882 utf8::encode $uniq; 2044 utf8::encode $uniq;
1883 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1884 $self->clear_unique_items; 2047 $self->clear_unique_items;
1885 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1886 } 2051 }
1887 } 2052 }
2053
2054 $f->resolve_delayed_derefs;
1888 2055
1889 cf::cede_to_tick; 2056 cf::cede_to_tick;
1890 # now do the right thing for maps 2057 # now do the right thing for maps
1891 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1892 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1978 } 2145 }
1979 2146
1980 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
1981 2148
1982 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1983 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1984 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $k) { 2154 if (my $map = find $k) {
1986 $map->load if $v; 2155 $map->load if $v;
1987 } 2156 }
2013 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2014 2183
2015 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2016 2185
2017 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2019 }; 2189 };
2020 2190
2021 if ($uniq) { 2191 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2036 2206
2037 return if $self->players; 2207 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2209 return if $self->{deny_save};
2040 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2215 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2216}
2044 2217
2045sub reset_at { 2218sub reset_at {
2046 my ($self) = @_; 2219 my ($self) = @_;
2047 2220
2079 if $uniq; 2252 if $uniq;
2080 } 2253 }
2081 2254
2082 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2083 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2259 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2260
2088 $self->unlink_save; 2261 $self->unlink_save;
2089 $self->destroy; 2262 $self->destroy;
2090} 2263}
2091 2264
2192 2365
2193sub inv_recursive { 2366sub inv_recursive {
2194 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2195} 2368}
2196 2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
2396}
2397
2197package cf; 2398package cf;
2198 2399
2199=back 2400=back
2200 2401
2201=head3 cf::object::player 2402=head3 cf::object::player
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2561
2361 $self->enter_link; 2562 $self->enter_link;
2362 2563
2363 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2364 my $map = eval { 2586 my $map = eval {
2365 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2366 2588
2367 if ($map) { 2589 if ($map) {
2368 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2370 } else { 2592 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2594 }
2373 2595
2374 $map 2596 $map
2375 }; 2597 };
2376 2598
2429 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2430 } 2652 }
2431 2653
2432 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2433 2655
2434 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2435 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2437 2659
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2466 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2469 2691
2470 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2471 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2696 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2474 2698
2475 1; 2699 1;
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2512 2736
2513=cut 2737=cut
2514 2738
2739# non-persistent channels (usually the info channel)
2515our %CHANNEL = ( 2740our %CHANNEL = (
2516 "c/identify" => { 2741 "c/identify" => {
2517 id => "identify", 2742 id => "infobox",
2518 title => "Identify", 2743 title => "Identify",
2519 reply => undef, 2744 reply => undef,
2520 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2521 }, 2746 },
2522 "c/examine" => { 2747 "c/examine" => {
2523 id => "examine", 2748 id => "infobox",
2524 title => "Examine", 2749 title => "Examine",
2525 reply => undef, 2750 reply => undef,
2526 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2527 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2528); 2789);
2529 2790
2530sub cf::client::send_msg { 2791sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2532 2793
2533 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2534 2795
2535 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536 2797
2537 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2539 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2540 if (ref $channel) { 2807 } elsif (ref $channel) {
2541 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg; 2812 if $self->can_msg;
2762=pod 3029=pod
2763 3030
2764The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2765 3032
2766 cf::object 3033 cf::object
2767 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2768 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2769 3036
2770 cf::object::player 3037 cf::object::player
2771 player 3038 player
2772 3039
2779=cut 3046=cut
2780 3047
2781for ( 3048for (
2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2784 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2785 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2786 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2787 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2788) { 3055) {
2789 no strict 'refs'; 3056 no strict 'refs';
2894 { 3161 {
2895 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2896 3163
2897 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2898 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2899 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2903 3171
2904 cf::cede_to_tick; 3172 cf::cede_to_tick;
2905 } 3173 }
2906 3174
2907 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2908 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2909 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2910 or next; 3179 or next;
3180
2911 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2914 } else { 3184 } else {
2915 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2933 { 3203 {
2934 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2937 3207
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data; 3211 my $data;
2943 3212
2944 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
2945 # prepend meta info 3214 # prepend meta info
2946 3215
2947 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
2948 name => $name, 3217 name => $name,
2949 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
2950 }); 3219 });
2951 3220
2952 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
2953 } else { 3228 } else {
2954 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
2955 } 3230 }
2956 3231
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick; 3232 cf::cede_to_tick;
2961 } 3233 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2980 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2981 3237
2982 1 3238 1
2983} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
2984 3260
2985register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
2987 3263
2988 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
3043sub reload_config { 3319sub reload_config {
3044 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3045 or return; 3321 or return;
3046 3322
3047 local $/; 3323 local $/;
3048 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3049 3325
3050 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3051 3327
3052 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3053 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3064sub main { 3340sub main {
3065 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3066 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3067 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3068 (async { 3344 (async {
3069 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3070 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3071 }; 3348 };
3072 3349
3073 reload_config; 3350 reload_config;
3074 db_init; 3351 db_init;
3075 load_extensions; 3352 load_extensions;
3076 3353
3077 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3078 Event::loop; 3356 EV::loop;
3079} 3357}
3080 3358
3081############################################################################# 3359#############################################################################
3082# initialisation and cleanup 3360# initialisation and cleanup
3083 3361
3084# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3085BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3086 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3087 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3088 reentrant => 0,
3089 data => WF_AUTOCANCEL,
3090 signal => $signal,
3091 prio => 0,
3092 cb => sub {
3093 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3094 },
3095 ); 3368 };
3096 } 3369 }
3097} 3370}
3098 3371
3099sub write_runtime { 3372sub write_runtime {
3100 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
3145 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3146 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3147 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3148 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3149 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3150 $pl->save; 3424 $pl->save;
3151 } 3425 }
3152 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3153 3427
3154 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
3193 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3194 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3195 3469
3196 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3197 3471
3198 warn "cancelling all WF_AUTOCANCEL watchers";
3199 for (Event::all_watchers) {
3200 $_->cancel if $_->data & WF_AUTOCANCEL;
3201 }
3202
3203 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3204 for (;;) { 3473 for (;;) {
3205 BDB::flush; 3474 BDB::flush;
3206 IO::AIO::flush; 3475 IO::AIO::flush;
3207 Coro::cede; 3476 Coro::cede_notself;
3208 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3209 warn "iterate..."; 3478 warn "iterate...";
3210 } 3479 }
3211 3480
3212 ++$RELOAD; 3481 ++$RELOAD;
3288 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3289 3558
3290 1 3559 1
3291 } or do { 3560 } or do {
3292 warn $@; 3561 warn $@;
3293 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3294 exit 1;
3295 }; 3563 };
3296 3564
3297 warn "reloaded"; 3565 warn "reloaded";
3298}; 3566};
3299 3567
3301 3569
3302sub reload_perl() { 3570sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3305 3573
3306 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3307 reentrant => 0,
3308 after => 0,
3309 data => WF_AUTOCANCEL,
3310 cb => sub {
3311 do_reload_perl; 3575 do_reload_perl;
3312 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3313 },
3314 ); 3577 };
3315} 3578}
3316 3579
3317register_command "reload" => sub { 3580register_command "reload" => sub {
3318 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3319 3582
3320 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3321 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3322 async { reload_perl }; 3587 reload_perl;
3588 };
3323 } 3589 }
3324}; 3590};
3325 3591
3326unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3327 3593
3346 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait; 3614 $signal->wait;
3349} 3615}
3350 3616
3351 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3352 my $avg = 10;
3353$TICK_WATCHER = Event->timer (
3354 reentrant => 0,
3355 parked => 1,
3356 prio => 0,
3357 at => $NEXT_TICK || $TICK,
3358 data => WF_AUTOCANCEL,
3359 cb => sub {
3360 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3362 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3363 return; 3621 return;
3364 } 3622 }
3365 3623
3366 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3367 3625
3368 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3369 3627
3370 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3371 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375 3630
3376 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3377 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3378 $map->alloc; 3633 Coro::async_pool {
3379 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3380 my $t = Event::time - $t; 3635 write_runtime
3381 3636 or warn "ERROR: unable to write runtime file: $!";
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 }; 3637 };
3638 }
3392 3639
3393 $RUNTIME += $TICK;
3394 $NEXT_TICK += $TICK;
3395
3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
3398 Coro::async_pool {
3399 write_runtime
3400 or warn "ERROR: unable to write runtime file: $!";
3401 };
3402 }
3403
3404# my $AFTER = Event::time;
3405# warn $AFTER - $NOW;#d#
3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send; 3641 $sig->send;
3409 } 3642 }
3410 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send; 3644 $sig->send;
3412 } 3645 }
3413 3646
3414 $NOW = Event::time;
3415
3416 # if we are delayed by four ticks or more, skip them all
3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3418
3419 $TICK_WATCHER->at ($NEXT_TICK);
3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424 3649
3425 _post_tick; 3650 _post_tick;
3426 3651};
3427 3652$TICK_WATCHER->priority (EV::MAXPRI);
3428 },
3429);
3430 3653
3431{ 3654{
3432 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3433 $BDB_POLL_WATCHER = Event->io ( 3656
3434 reentrant => 0,
3435 fd => BDB::poll_fileno,
3436 poll => 'r',
3437 prio => 0,
3438 data => WF_AUTOCANCEL,
3439 cb => \&BDB::poll_cb,
3440 );
3441 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3442 3658 BDB::max_poll_reqs $TICK * 0.1;
3443 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3444 my $status;
3445 my $current = $Coro::current;
3446 (
3447 sub {
3448 $status = $!;
3449 $current->ready; undef $current;
3450 },
3451 sub {
3452 Coro::schedule while defined $current;
3453 $! = $status;
3454 },
3455 )
3456 };
3457 3660
3458 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3459 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3460 3667
3461 cf::sync_job { 3668 cf::sync_job {
3462 eval { 3669 eval {
3463 BDB::db_env_open 3670 BDB::db_env_open
3464 $DB_ENV, 3671 $DB_ENV,
3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3468 0666; 3675 0666;
3469 3676
3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3471
3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3473 $DB_ENV->set_lk_detect;
3474 }; 3678 };
3475 3679
3476 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3477 }; 3681 };
3478 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3479} 3693}
3480 3694
3481{ 3695{
3696 # configure IO::AIO
3697
3482 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3483
3484 undef $Coro::AIO::WATCHER;
3485 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3486 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3487 reentrant => 0,
3488 data => WF_AUTOCANCEL,
3489 fd => IO::AIO::poll_fileno,
3490 poll => 'r',
3491 prio => 6,
3492 cb => \&IO::AIO::poll_cb,
3493 );
3494} 3701}
3495 3702
3496my $_log_backtrace; 3703my $_log_backtrace;
3497 3704
3498sub _log_backtrace { 3705sub _log_backtrace {
3502 3709
3503 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace; 3712 ++$_log_backtrace;
3506 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3507 my @bt = fork_call { 3716 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines