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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use 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::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
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
… …
354our @SLOT_QUEUE; 354our @SLOT_QUEUE;
355our $SLOT_QUEUE; 355our $SLOT_QUEUE;
356 356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
359 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
360 362
361 while () { 363 while () {
362 next_job: 364 next_job:
363 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
371 } 373 }
372 } 374 }
373 } 375 }
374 376
375 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 380 $signal->wait;
379 } else { 381 } else {
380 Coro::schedule; 382 Coro::schedule;
381 } 383 }
… …
425 my $time = Event::time; 427 my $time = Event::time;
426 428
427 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
429 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
430 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 435 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
433 437
434 my $busy = 1; 438 my $busy = 1;
435 my @res; 439 my @res;
436 440
437 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 443 @res = eval { $job->() };
439 warn $@ if $@; 444 warn $@ if $@;
440 undef $busy; 445 undef $busy;
441 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
442 447
443 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
444 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
445 } 454 }
446 455
447 $time = Event::time - $time; 456 $time = Event::time - $time;
448 457
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
961 970
962=cut 971=cut
963 972
964############################################################################# 973#############################################################################
965# object support 974# object support
966#
967 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
968sub _can_merge { 1009sub _can_merge {
969 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
970 1011
971 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1013
975 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
976} 1016}
977 1017
978sub reattach { 1018sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1026); 1066);
1027 1067
1028sub object_freezer_save { 1068sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1030 1070
1031 my $guard = cf::lock_acquire "io";
1032
1033 sync_job { 1071 sync_job {
1034 if (length $$rdata) { 1072 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1043 close $fh; 1081 close $fh;
1044 1082
1045 if (@$objs) { 1083 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1089 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1091 }
… …
1062 } else { 1100 } else {
1063 aio_unlink $filename; 1101 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1065 } 1103 }
1066 }; 1104 };
1067
1068 undef $guard;
1069} 1105}
1070 1106
1071sub object_freezer_as_string { 1107sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1073 1109
… …
1078 1114
1079sub object_thawer_load { 1115sub object_thawer_load {
1080 my ($filename) = @_; 1116 my ($filename) = @_;
1081 1117
1082 my ($data, $av); 1118 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1119
1086 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1087 or return; 1121 or return;
1088 1122
1089 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1125 or return;
1092 1126
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1095 } 1129 }
1096 1130
1097 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1514 1548
1515Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1516 1550
1517=cut 1551=cut
1518 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1519sub expand_cfpod { 1564sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1521 1566
1522 # escape & and < 1567 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1568
1526 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1527 1572
1528 1 while 1573 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1578 ([BCGHITU])
1534 # replace G<male|female> tags 1579 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1580 (?:
1536 $self->gender ? $2 : $1 1581 ([^<>]*) (?{ $group = $^N })
1537 }ge 1582 | < $interior >
1538 # replace H<hint text> 1583 )
1539 || s{H<([^\>]*)>} 1584 >
1585 %gcsx
1540 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1606 "")
1544 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1546 1618
1619 for ($xml) {
1547 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1549 1622
1550 # compress some whitespace 1623 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1555 1629
1556 $_ 1630 $xml
1557} 1631}
1632
1633no re 'eval';
1558 1634
1559sub hintmode { 1635sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1637 $_[0]{hintmode}
1562} 1638}
… …
2043 } 2119 }
2044 2120
2045 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
2046 2122
2047 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2048 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2128 if (my $map = find $k) {
2051 $map->load if $v; 2129 $map->load if $v;
2052 } 2130 }
… …
2078 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2079 2157
2080 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2081 2159
2082 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2084 }; 2163 };
2085 2164
2086 if ($uniq) { 2165 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2353=cut
2275 2354
2276sub deref { 2355sub deref {
2277 my ($ref) = @_; 2356 my ($ref) = @_;
2278 2357
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2359 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2361 or return;
2286 $pl->ob->uuid eq $uuid 2362 $pl->ob->uuid eq $uuid
2287 or return; 2363 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2535
2460 $self->enter_link; 2536 $self->enter_link;
2461 2537
2462 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2463 # *tag paths override both path and x|y 2541 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2542 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2544 my $ob = $obs[rand @obs];
2467 2545
… …
2584 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2587 2665
2588 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2589 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2670 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2592 2672
2593 1; 2673 1;
… …
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2630 2710
2631=cut 2711=cut
2632 2712
2713# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2714our %CHANNEL = (
2634 "c/identify" => { 2715 "c/identify" => {
2635 id => "identify", 2716 id => "infobox",
2636 title => "Identify", 2717 title => "Identify",
2637 reply => undef, 2718 reply => undef,
2638 tooltip => "Items recently identified", 2719 tooltip => "Items recently identified",
2639 }, 2720 },
2640 "c/examine" => { 2721 "c/examine" => {
2641 id => "examine", 2722 id => "infobox",
2642 title => "Examine", 2723 title => "Examine",
2643 reply => undef, 2724 reply => undef,
2644 tooltip => "Signs and other items you examined", 2725 tooltip => "Signs and other items you examined",
2645 }, 2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2646); 2763);
2647 2764
2648sub cf::client::send_msg { 2765sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2767
2651 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2652 2769
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2771
2655 # check predefined channels, for the benefit of C 2772 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2657 2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2658 if (ref $channel) { 2781 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2785 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2786 if $self->can_msg;
… …
2880=pod 3003=pod
2881 3004
2882The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2883 3006
2884 cf::object 3007 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2887 3010
2888 cf::object::player 3011 cf::object::player
2889 player 3012 player
2890 3013
… …
2897=cut 3020=cut
2898 3021
2899for ( 3022for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2906) { 3029) {
2907 no strict 'refs'; 3030 no strict 'refs';
… …
3182sub main { 3305sub main {
3183 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3187 Event::one_event; 3311 Event::one_event;
3188 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3189 }; 3313 };
3190 3314
3191 reload_config; 3315 reload_config;
… …
3263 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3393 $pl->save;
3269 } 3394 }
3270 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3271 3396
3272 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3320 3445
3321 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3322 for (;;) { 3447 for (;;) {
3323 BDB::flush; 3448 BDB::flush;
3324 IO::AIO::flush; 3449 IO::AIO::flush;
3325 Coro::cede; 3450 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3452 warn "iterate...";
3328 } 3453 }
3329 3454
3330 ++$RELOAD; 3455 ++$RELOAD;
… …
3435register_command "reload" => sub { 3560register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3437 3562
3438 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3567 reload_perl;
3568 };
3441 } 3569 }
3442}; 3570};
3443 3571
3444unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3445 3573
… …
3487 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3488 3616
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3491 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3621 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3494 }; 3623 };
3495 } 3624 }
3496 3625
… …
3606 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3607 reentrant => 0, 3736 reentrant => 0,
3608 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3610 poll => 'r', 3739 poll => 'r',
3611 prio => 6, 3740 prio => 0,
3612 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3613 ); 3742 );
3614} 3743}
3615 3744
3616my $_log_backtrace; 3745my $_log_backtrace;
… …
3622 3751
3623 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 3754 ++$_log_backtrace;
3626 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3627 my @bt = fork_call { 3758 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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