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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 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 || []};
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1388
1355 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1390 or return;
1357 1391
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1360 or return; 1393 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
1515 1548
1516Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1517 1550
1518=cut 1551=cut
1519 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1520sub expand_cfpod { 1563sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1522 1565
1523 # escape & and < 1566 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1567
1527 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1528 1571
1529 1 while 1572 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1577 ([BCGHITU])
1535 # replace G<male|female> tags 1578 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1579 (?:
1537 $self->gender ? $2 : $1 1580 ([^<>]*) (?{ $group = $^N })
1538 }ge 1581 | < $interior >
1539 # replace H<hint text> 1582 )
1540 || s{H<([^\>]*)>} 1583 >
1584 %gcsx
1541 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1605 "")
1545 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1547 1617
1618 for ($xml) {
1548 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1550 1621
1551 # compress some whitespace 1622 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1556 1628
1557 $_ 1629 $xml
1558} 1630}
1559 1631
1560sub hintmode { 1632sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1634 $_[0]{hintmode}
… …
2044 } 2116 }
2045 2117
2046 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2047 2119
2048 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
2049 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2125 if (my $map = find $k) {
2052 $map->load if $v; 2126 $map->load if $v;
2053 } 2127 }
… …
2079 return if $self->{deny_save}; 2153 return if $self->{deny_save};
2080 2154
2081 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
2082 2156
2083 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2085 }; 2160 };
2086 2161
2087 if ($uniq) { 2162 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2275=cut 2350=cut
2276 2351
2277sub deref { 2352sub deref {
2278 my ($ref) = @_; 2353 my ($ref) = @_;
2279 2354
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2356 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2358 or return;
2287 $pl->ob->uuid eq $uuid 2359 $pl->ob->uuid eq $uuid
2288 or return; 2360 or return;
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2532
2461 $self->enter_link; 2533 $self->enter_link;
2462 2534
2463 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2464 # *tag paths override both path and x|y 2538 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2539 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2541 my $ob = $obs[rand @obs];
2468 2542
… …
2585 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2588 2662
2589 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2590 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2667 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2593 2669
2594 1; 2670 1;
… …
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2631 2707
2632=cut 2708=cut
2633 2709
2710# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2711our %CHANNEL = (
2635 "c/identify" => { 2712 "c/identify" => {
2636 id => "identify", 2713 id => "infobox",
2637 title => "Identify", 2714 title => "Identify",
2638 reply => undef, 2715 reply => undef,
2639 tooltip => "Items recently identified", 2716 tooltip => "Items recently identified",
2640 }, 2717 },
2641 "c/examine" => { 2718 "c/examine" => {
2642 id => "examine", 2719 id => "infobox",
2643 title => "Examine", 2720 title => "Examine",
2644 reply => undef, 2721 reply => undef,
2645 tooltip => "Signs and other items you examined", 2722 tooltip => "Signs and other items you examined",
2646 }, 2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2647); 2760);
2648 2761
2649sub cf::client::send_msg { 2762sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2764
2652 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2653 2766
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2768
2656 # check predefined channels, for the benefit of C 2769 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2658 2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2659 if (ref $channel) { 2778 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2779 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2780 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2781 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2782 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2783 if $self->can_msg;
… …
2881=pod 3000=pod
2882 3001
2883The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2884 3003
2885 cf::object 3004 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3005 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3006 insert remove name archname title slaying race decrease_ob_nr
2888 3007
2889 cf::object::player 3008 cf::object::player
2890 player 3009 player
2891 3010
… …
2898=cut 3017=cut
2899 3018
2900for ( 3019for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3021 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3022 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2907) { 3026) {
2908 no strict 'refs'; 3027 no strict 'refs';
… …
3183sub main { 3302sub main {
3184 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
3188 Event::one_event; 3308 Event::one_event;
3189 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
3190 }; 3310 };
3191 3311
3192 reload_config; 3312 reload_config;
… …
3264 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3390 $pl->save;
3270 } 3391 }
3271 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
3272 3393
3273 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
… …
3321 3442
3322 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
3323 for (;;) { 3444 for (;;) {
3324 BDB::flush; 3445 BDB::flush;
3325 IO::AIO::flush; 3446 IO::AIO::flush;
3326 Coro::cede; 3447 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3449 warn "iterate...";
3329 } 3450 }
3330 3451
3331 ++$RELOAD; 3452 ++$RELOAD;
… …
3436register_command "reload" => sub { 3557register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3438 3559
3439 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3564 reload_perl;
3565 };
3442 } 3566 }
3443}; 3567};
3444 3568
3445unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3446 3570
… …
3488 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3489 3613
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3492 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3618 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3495 }; 3620 };
3496 } 3621 }
3497 3622
… …
3607 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3608 reentrant => 0, 3733 reentrant => 0,
3609 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3611 poll => 'r', 3736 poll => 'r',
3612 prio => 6, 3737 prio => 0,
3613 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3614 ); 3739 );
3615} 3740}
3616 3741
3617my $_log_backtrace; 3742my $_log_backtrace;
… …
3623 3748
3624 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3751 ++$_log_backtrace;
3627 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3628 my @bt = fork_call { 3755 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

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