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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 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
… …
162 162
163The raw value load value from the last tick. 163The raw value load value from the last tick.
164 164
165=item %cf::CFG 165=item %cf::CFG
166 166
167Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 168from wherever your confdir points to.
169 169
170=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
171 171
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
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 }
… …
404 406
405BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
406 408
407=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
408 410
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 414acceptable.
413 415
414If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
… …
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"
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
655 664
656In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 667Deliantra).
659 668
660=over 4 669=over 4
661 670
662=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
663 672
… …
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) = @_;
… …
1041 close $fh; 1081 close $fh;
1042 1082
1043 if (@$objs) { 1083 if (@$objs) {
1044 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) {
1045 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1089 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1091 }
… …
1082 1122
1083 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1125 or return;
1086 1126
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1088 } 1129 }
1089 1130
1090 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1507 1548
1508Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1509 1550
1510=cut 1551=cut
1511 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
1512sub expand_cfpod { 1564sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1514 1566
1515 # escape & and < 1567 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1568
1519 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1520 1572
1521 1 while 1573 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1578 ([BCGHITU])
1527 # replace G<male|female> tags 1579 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1580 (?:
1529 $self->gender ? $2 : $1 1581 ([^<>]*) (?{ $group = $^N })
1530 }ge 1582 | < $interior >
1531 # replace H<hint text> 1583 )
1532 || s{H<([^\>]*)>} 1584 >
1585 %gcsx
1533 { 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") {
1534 ("<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>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1606 "")
1537 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1539 1618
1619 for ($xml) {
1540 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1542 1622
1543 # compress some whitespace 1623 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1548 1629
1549 $_ 1630 $xml
1550} 1631}
1632
1633no re 'eval';
1551 1634
1552sub hintmode { 1635sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1637 $_[0]{hintmode}
1555} 1638}
… …
2036 } 2119 }
2037 2120
2038 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
2039 2122
2040 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2041 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2128 if (my $map = find $k) {
2044 $map->load if $v; 2129 $map->load if $v;
2045 } 2130 }
… …
2071 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2072 2157
2073 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2074 2159
2075 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2077 }; 2163 };
2078 2164
2079 if ($uniq) { 2165 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2267=cut 2353=cut
2268 2354
2269sub deref { 2355sub deref {
2270 my ($ref) = @_; 2356 my ($ref) = @_;
2271 2357
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2359 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2361 or return;
2279 $pl->ob->uuid eq $uuid 2362 $pl->ob->uuid eq $uuid
2280 or return; 2363 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2535
2453 $self->enter_link; 2536 $self->enter_link;
2454 2537
2455 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2456 # *tag paths override both path and x|y 2541 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2542 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2544 my $ob = $obs[rand @obs];
2460 2545
… …
2577 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2580 2665
2581 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2582 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2670 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2585 2672
2586 1; 2673 1;
… …
2621the 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
2622the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2623 2710
2624=cut 2711=cut
2625 2712
2713# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2714our %CHANNEL = (
2627 "c/identify" => { 2715 "c/identify" => {
2628 id => "identify", 2716 id => "infobox",
2629 title => "Identify", 2717 title => "Identify",
2630 reply => undef, 2718 reply => undef,
2631 tooltip => "Items recently identified", 2719 tooltip => "Items recently identified",
2632 }, 2720 },
2633 "c/examine" => { 2721 "c/examine" => {
2634 id => "examine", 2722 id => "infobox",
2635 title => "Examine", 2723 title => "Examine",
2636 reply => undef, 2724 reply => undef,
2637 tooltip => "Signs and other items you examined", 2725 tooltip => "Signs and other items you examined",
2638 }, 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 },
2639); 2763);
2640 2764
2641sub cf::client::send_msg { 2765sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2767
2644 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2645 2769
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2771
2648 # check predefined channels, for the benefit of C 2772 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2650 2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2651 if (ref $channel) { 2781 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2785 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2786 if $self->can_msg;
… …
2873=pod 3003=pod
2874 3004
2875The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2876 3006
2877 cf::object 3007 cf::object
2878 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
2879 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2880 3010
2881 cf::object::player 3011 cf::object::player
2882 player 3012 player
2883 3013
… …
2890=cut 3020=cut
2891 3021
2892for ( 3022for (
2893 ["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
2894 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2899) { 3029) {
2900 no strict 'refs'; 3030 no strict 'refs';
… …
3175sub main { 3305sub main {
3176 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3178 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#
3179 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3311 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3182 }; 3313 };
3183 3314
3184 reload_config; 3315 reload_config;
… …
3256 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3393 $pl->save;
3262 } 3394 }
3263 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3264 3396
3265 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3313 3445
3314 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3315 for (;;) { 3447 for (;;) {
3316 BDB::flush; 3448 BDB::flush;
3317 IO::AIO::flush; 3449 IO::AIO::flush;
3318 Coro::cede; 3450 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3452 warn "iterate...";
3321 } 3453 }
3322 3454
3323 ++$RELOAD; 3455 ++$RELOAD;
… …
3428register_command "reload" => sub { 3560register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3430 3562
3431 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3567 reload_perl;
3568 };
3434 } 3569 }
3435}; 3570};
3436 3571
3437unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3438 3573
… …
3480 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3481 3616
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3621 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3623 };
3488 } 3624 }
3489 3625
… …
3599 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3600 reentrant => 0, 3736 reentrant => 0,
3601 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3603 poll => 'r', 3739 poll => 'r',
3604 prio => 6, 3740 prio => 0,
3605 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3606 ); 3742 );
3607} 3743}
3608 3744
3609my $_log_backtrace; 3745my $_log_backtrace;
… …
3615 3751
3616 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3754 ++$_log_backtrace;
3619 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3620 my @bt = fork_call { 3758 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 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 |"
3624 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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