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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.396 by root, Wed Nov 14 08:09:46 2007 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;
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.1 ();
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::Storable; 23use Coro::Storable;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
38# 38#
39$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::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 41Compress::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 42
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
47 45
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
80our $NEXT_TICK; 78our $NEXT_TICK;
81our $NOW; 79our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
… …
159 160
160The raw value load value from the last tick. 161The raw value load value from the last tick.
161 162
162=item %cf::CFG 163=item %cf::CFG
163 164
164Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 166from wherever your confdir points to.
166 167
167=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
168 169
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 188 $msg .= "\n"
188 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
189 190
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 192
192 utf8::encode $msg;
193 LOG llevError, $msg; 193 LOG llevError, $msg;
194 }; 194 };
195} 195}
196 196
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
213)) { 213)) {
214 no strict 'refs'; 214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 216}
217 217
218$Event::DIED = sub { 218$EV::DIED = sub {
219 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
220}; 220};
221 221
222############################################################################# 222#############################################################################
223 223
… …
334 }; 334 };
335 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
336 $guard 336 $guard
337} 337}
338 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
339=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
340 355
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
… …
352our @SLOT_QUEUE; 367our @SLOT_QUEUE;
353our $SLOT_QUEUE; 368our $SLOT_QUEUE;
354 369
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
357 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
358 375
359 while () { 376 while () {
360 next_job: 377 next_job:
361 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
… …
369 } 386 }
370 } 387 }
371 } 388 }
372 389
373 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 393 $signal->wait;
377 } else { 394 } else {
378 Coro::schedule; 395 Coro::schedule;
379 } 396 }
… …
402 419
403BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
404 421
405=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
406 423
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 427acceptable.
411 428
412If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
… …
418 435
419sub sync_job(&) { 436sub sync_job(&) {
420 my ($job) = @_; 437 my ($job) = @_;
421 438
422 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 440 my $time = EV::time;
424 441
425 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
427 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
428 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 448 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
431 450
432 my $busy = 1; 451 my $busy = 1;
433 my @res; 452 my @res;
434 453
435 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 456 @res = eval { $job->() };
437 warn $@ if $@; 457 warn $@ if $@;
438 undef $busy; 458 undef $busy;
439 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
440 460
441 while ($busy) { 461 while ($busy) {
442 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
443 } 466 }
467 }
444 468
445 $time = Event::time - $time; 469 $time = EV::time - $time;
446 470
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 473
450 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
480=item fork_call { }, $args 504=item fork_call { }, $args
481 505
482Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
486 510
487=cut 511=cut
488 512
489sub fork_call(&@) { 513sub fork_call(&@) {
490 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
508=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
509 533
510Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
513=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
514 560
515our $DB; 561our $DB;
516 562
517sub db_init { 563sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 564 cf::sync_job {
522 eval { 565 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 566 };
532} 567}
533 568
534sub db_get($$) { 569sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
536 571
… …
640attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
642 677
643In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 680Deliantra).
646 681
647=over 4 682=over 4
648 683
649=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
650 685
… …
948 983
949=cut 984=cut
950 985
951############################################################################# 986#############################################################################
952# object support 987# object support
953#
954 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
955sub _can_merge { 1022sub _can_merge {
956 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
957 1024
958 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1026
962 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
963} 1029}
964 1030
965sub reattach { 1031sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1013); 1079);
1014 1080
1015sub object_freezer_save { 1081sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1017 1083
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1084 sync_job {
1021 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
1024 1089
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1094 close $fh;
1030 1095
1031 if (@$objs) { 1096 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1102 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1104 }
… …
1048 } else { 1113 } else {
1049 aio_unlink $filename; 1114 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1051 } 1116 }
1052 }; 1117 };
1053
1054 undef $guard;
1055} 1118}
1056 1119
1057sub object_freezer_as_string { 1120sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1059 1122
… …
1064 1127
1065sub object_thawer_load { 1128sub object_thawer_load {
1066 my ($filename) = @_; 1129 my ($filename) = @_;
1067 1130
1068 my ($data, $av); 1131 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1132
1072 (aio_load $filename, $data) >= 0 1133 (aio_load $filename, $data) >= 0
1073 or return; 1134 or return;
1074 1135
1075 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1138 or return;
1078 1139
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1081 } 1142 }
1082 1143
1144 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1085 1147
1086 ($data, $av) 1148 ($data, $av)
1087} 1149}
1088 1150
1089=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
… …
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1401
1340 my $f = new_from_file cf::object::thawer path $login 1402 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1403 or return;
1342 1404
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1405 my $pl = cf::player::load_pl $f
1345 or return; 1406 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1407 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1408 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
… …
1500 1561
1501Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1502 1563
1503=cut 1564=cut
1504 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1505sub expand_cfpod { 1577sub expand_cfpod {
1506 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1507 1579
1508 # escape & and < 1580 my $xml;
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511 1581
1512 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1513 1585
1514 1 while 1586 $group =~ s/&/&amp;/g;
1515 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1516 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1517 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1518 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1520 # replace G<male|female> tags 1592 <
1521 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1522 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1523 }ge 1595 | < $interior >
1524 # replace H<hint text> 1596 )
1525 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1526 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "") 1619 "")
1530 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1531 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1532 1631
1632 for ($xml) {
1533 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1535 1635
1536 # compress some whitespace 1636 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1541 1642
1542 $_ 1643 $xml
1543} 1644}
1645
1646no re 'eval';
1544 1647
1545sub hintmode { 1648sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode} 1650 $_[0]{hintmode}
1548} 1651}
… …
2029 } 2132 }
2030 2133
2031 $MAP_PREFETCH{$path} |= $load; 2134 $MAP_PREFETCH{$path} |= $load;
2032 2135
2033 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
2034 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2141 if (my $map = find $k) {
2037 $map->load if $v; 2142 $map->load if $v;
2038 } 2143 }
… …
2064 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2065 2170
2066 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2067 2172
2068 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2070 }; 2176 };
2071 2177
2072 if ($uniq) { 2178 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2260=cut 2366=cut
2261 2367
2262sub deref { 2368sub deref {
2263 my ($ref) = @_; 2369 my ($ref) = @_;
2264 2370
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2372 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2374 or return;
2272 $pl->ob->uuid eq $uuid 2375 $pl->ob->uuid eq $uuid
2273 or return; 2376 or return;
… …
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2548
2446 $self->enter_link; 2549 $self->enter_link;
2447 2550
2448 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2449 my $map = eval { 2573 my $map = eval {
2450 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2451 2575
2452 if ($map) { 2576 if ($map) {
2453 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2455 } else { 2579 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2581 }
2458 2582
2459 $map 2583 $map
2460 }; 2584 };
2461 2585
… …
2551 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2554 2678
2555 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2556 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2683 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2559 2685
2560 1; 2686 1;
… …
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2597 2723
2598=cut 2724=cut
2599 2725
2726# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2727our %CHANNEL = (
2601 "c/identify" => { 2728 "c/identify" => {
2602 id => "identify", 2729 id => "infobox",
2603 title => "Identify", 2730 title => "Identify",
2604 reply => undef, 2731 reply => undef,
2605 tooltip => "Items recently identified", 2732 tooltip => "Items recently identified",
2606 }, 2733 },
2607 "c/examine" => { 2734 "c/examine" => {
2608 id => "examine", 2735 id => "infobox",
2609 title => "Examine", 2736 title => "Examine",
2610 reply => undef, 2737 reply => undef,
2611 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2612 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2613); 2776);
2614 2777
2615sub cf::client::send_msg { 2778sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2780
2618 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2619 2782
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2784
2622 # check predefined channels, for the benefit of C 2785 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2624 2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2625 if (ref $channel) { 2794 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2798 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2799 if $self->can_msg;
… …
2847=pod 3016=pod
2848 3017
2849The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2850 3019
2851 cf::object 3020 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2854 3023
2855 cf::object::player 3024 cf::object::player
2856 player 3025 player
2857 3026
… …
2864=cut 3033=cut
2865 3034
2866for ( 3035for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2873) { 3042) {
2874 no strict 'refs'; 3043 no strict 'refs';
… …
3149sub main { 3318sub main {
3150 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3322 (async {
3154 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3156 }; 3326 };
3157 3327
3158 reload_config; 3328 reload_config;
3159 db_init; 3329 db_init;
3160 load_extensions; 3330 load_extensions;
3161 3331
3162 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3163 Event::loop; 3333 EV::loop;
3164} 3334}
3165 3335
3166############################################################################# 3336#############################################################################
3167# initialisation and cleanup 3337# initialisation and cleanup
3168 3338
3169# install some emergency cleanup handlers 3339# install some emergency cleanup handlers
3170BEGIN { 3340BEGIN {
3341 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3342 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3343 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3344 cf::cleanup "SIG$signal";
3179 },
3180 ); 3345 };
3181 } 3346 }
3182} 3347}
3183 3348
3184sub write_runtime { 3349sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime"; 3350 my $runtime = "$LOCALDIR/runtime";
… …
3230 # and maps saved/destroyed asynchronously. 3395 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3396 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3397 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3398 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3399 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3401 $pl->save;
3236 } 3402 }
3237 warn "end emergency player save\n"; 3403 warn "end emergency player save\n";
3238 3404
3239 warn "begin emergency map save\n"; 3405 warn "begin emergency map save\n";
… …
3278 warn "syncing database to disk"; 3444 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3445 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3446
3281 # if anything goes wrong in here, we should simply crash as we already saved 3447 # if anything goes wrong in here, we should simply crash as we already saved
3282 3448
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3449 warn "flushing outstanding aio requests";
3289 for (;;) { 3450 for (;;) {
3290 BDB::flush; 3451 BDB::flush;
3291 IO::AIO::flush; 3452 IO::AIO::flush;
3292 Coro::cede; 3453 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3454 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3455 warn "iterate...";
3295 } 3456 }
3296 3457
3297 ++$RELOAD; 3458 ++$RELOAD;
… …
3386 3547
3387sub reload_perl() { 3548sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3549 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3550 # coro crashes during coro_state_free->destroy here.
3390 3551
3391 $RELOAD_WATCHER ||= Event->timer ( 3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3553 undef $RELOAD_WATCHER;
3398 }, 3554 do_reload_perl;
3399 ); 3555 };
3400} 3556}
3401 3557
3402register_command "reload" => sub { 3558register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3559 my ($who, $arg) = @_;
3404 3560
3405 if ($who->flag (FLAG_WIZ)) { 3561 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3562 $who->message ("reloading server.");
3563 async {
3564 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3565 reload_perl;
3566 };
3408 } 3567 }
3409}; 3568};
3410 3569
3411unshift @INC, $LIBDIR; 3570unshift @INC, $LIBDIR;
3412 3571
… …
3431 my $signal = new Coro::Signal; 3590 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3591 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3592 $signal->wait;
3434} 3593}
3435 3594
3436 my $min = 1e6;#d# 3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3598 unless ++$bug_warning > 10;
3448 return; 3599 return;
3449 } 3600 }
3450 3601
3451 $NOW = $tick_start = Event::time; 3602 $NOW = $tick_start = EV::now;
3452 3603
3453 cf::server_tick; # one server iteration 3604 cf::server_tick; # one server iteration
3454 3605
3455 0 && sync_job {#d# 3606 $RUNTIME += $TICK;
3456 for(1..10) { 3607 $NEXT_TICK += $TICK;
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 3608
3461 $map->width (50); 3609 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3610 $NEXT_RUNTIME_WRITE = $NOW + 10;
3463 $map->alloc; 3611 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3612 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3613 write_runtime
3466 3614 or warn "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3615 };
3616 }
3477 3617
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3619 $sig->send;
3494 } 3620 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3621 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3622 $sig->send;
3497 } 3623 }
3498 3624
3499 $NOW = Event::time;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK; 3625 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3627
3510 _post_tick; 3628 _post_tick;
3511 3629};
3512 3630$TICK_WATCHER->priority (EV::MAXPRI);
3513 },
3514);
3515 3631
3516{ 3632{
3633 BDB::min_parallel 8;
3517 BDB::max_poll_time $TICK * 0.1; 3634 BDB::max_poll_time $TICK * 0.1;
3518 $BDB_POLL_WATCHER = Event->io ( 3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8;
3527 3636
3528 BDB::set_sync_prepare { 3637 BDB::set_sync_prepare {
3529 my $status; 3638 my $status;
3530 my $current = $Coro::current; 3639 my $current = $Coro::current;
3531 ( 3640 (
… …
3540 ) 3649 )
3541 }; 3650 };
3542 3651
3543 unless ($DB_ENV) { 3652 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3653 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3655 | BDB::LOG_AUTOREMOVE, 1);
3656 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3657 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3658
3546 cf::sync_job { 3659 cf::sync_job {
3547 eval { 3660 eval {
3548 BDB::db_env_open 3661 BDB::db_env_open
3549 $DB_ENV, 3662 $DB_ENV,
… …
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3666 0666;
3554 3667
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3668 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3669 };
3560 3670
3561 cf::cleanup "db_env_open(db): $@" if $@; 3671 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3672 };
3563 } 3673 }
3674
3675 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3676 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3677 };
3678 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3679 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3680 };
3681 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 };
3564} 3684}
3565 3685
3566{ 3686{
3567 IO::AIO::min_parallel 8; 3687 IO::AIO::min_parallel 8;
3568 3688
3569 undef $Coro::AIO::WATCHER; 3689 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3690 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3692}
3580 3693
3581my $_log_backtrace; 3694my $_log_backtrace;
3582 3695
3583sub _log_backtrace { 3696sub _log_backtrace {
… …
3587 3700
3588 # limit the # of concurrent backtraces 3701 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3702 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3703 ++$_log_backtrace;
3591 async { 3704 async {
3705 $Coro::current->{desc} = "abt $msg";
3706
3592 my @bt = fork_call { 3707 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3708 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3709 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3710 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3711 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines