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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
… …
34use Storable (); 35use Storable ();
35 36
36use Coro (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
39use Coro::AnyEvent; 41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
43use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
61 63
62# configure various modules to our taste 64# configure various modules to our taste
63# 65#
64$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 68
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
69 87
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 89
72our %COMMAND = (); 90our %COMMAND = ();
73our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
… …
79our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
80 98
81our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
82our @EVENT; 100our @EVENT;
83 101
84our $CONFDIR = confdir; 102our $CONFDIR = confdir;
85our $DATADIR = datadir; 103our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
95our %RESOURCE; 116our %RESOURCE;
96 117
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 120our $NEXT_TICK;
… …
124 145
125binmode STDOUT; 146binmode STDOUT;
126binmode STDERR; 147binmode STDERR;
127 148
128# read virtual server time, if available 149# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
133} 154}
134 155
135mkdir $_ 156mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
243for my $pkg (qw( 264for my $pkg (qw(
244 cf::global cf::attachable 265 cf::global cf::attachable
245 cf::object cf::object::player 266 cf::object cf::object::player
246 cf::client cf::player 267 cf::client cf::player
247 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
248 cf::map cf::party cf::region 270 cf::party cf::region
249)) { 271)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 273}
253 274
254$EV::DIED = sub { 275$EV::DIED = sub {
255 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
… …
725 746
726############################################################################# 747#############################################################################
727 748
728=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
729 750
730Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
733 754
734In the following description, CLASS can be any of C<global>, C<object> 755In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 756C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
786 807
787Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
789 810
790Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
792 813
793These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
794 815
795=over 4 816=over 4
… …
1086 1107
1087sub reattach { 1108sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1110 my ($obj) = @_;
1090 1111
1112 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1114
1093 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
1094 1116
1095 @$registry = (); 1117 @$registry = ();
1096 1118
… …
1332 1354
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1357
1336 $ext{source} = 1358 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1339 . $source 1361 . $source
1340 . "\n};\n1"; 1362 . "\n};\n1";
1341 1363
1342 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
… …
1382 1404
1383=back 1405=back
1384 1406
1385=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1386 1408
1387Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1388 1410
1389=cut 1411=cut
1390 1412
1391package cf::player; 1413package cf::player;
1392 1414
… …
1520 my ($pl) = @_; 1542 my ($pl) = @_;
1521 1543
1522 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1523 1545
1524 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1548
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1550 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1552 $pl->ob->check_score;
… …
1616 } 1638 }
1617 1639
1618 \@paths 1640 \@paths
1619} 1641}
1620 1642
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1644
1623Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1646
1714=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1715 1648
1716Sends an ext reply to the player. 1649Sends an ext reply to the player.
1717 1650
… …
2531 2464
2532=item $player_object->enter_link 2465=item $player_object->enter_link
2533 2466
2534Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2535 2468
2536The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2538 2473
2539Will never block. 2474Will never block.
2540 2475
2541=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2542 2477
… …
2600 2535
2601 $map->load; 2536 $map->load;
2602 $map->load_neighbours; 2537 $map->load_neighbours;
2603 2538
2604 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2541 $self->activate_recursive;
2606 2542
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2609} 2545}
… …
2772 $self->contr->savebed ($map, $x, $y) 2708 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2709 if $exit->flag (cf::FLAG_DAMNED);
2774 2710
2775 1 2711 1
2776 }) { 2712 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2717
2782 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
… …
2871); 2807);
2872 2808
2873sub cf::client::send_msg { 2809sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2811
2876 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2877 2814
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2816
2880 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2839 if ($self->can_msg) {
2903 # default colour, mask it out 2840 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2906 2843
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2909 } else { 2860 } else {
2910 if ($color >= 0) { 2861 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2863 for ($msg) {
2913 1 while 2864 1 while
… …
3425 }; 3376 };
3426 warn $@ if $@; 3377 warn $@ if $@;
3427 } 3378 }
3428} 3379}
3429 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3430sub main { 3400sub main {
3401 atomic;
3402
3431 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3406 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3444 load_extensions; 3416 load_extensions;
3445 3417
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 } 3419 }
3448 3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3449 EV::loop; 3426 EV::loop;
3450} 3427}
3451 3428
3452############################################################################# 3429#############################################################################
3453# initialisation and cleanup 3430# initialisation and cleanup
… …
3461 }; 3438 };
3462 } 3439 }
3463} 3440}
3464 3441
3465sub write_runtime_sync { 3442sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3470 3445
3471 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3447
3473 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3474 3449
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3451 or return;
3477 3452
3478 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3491 3466
3492 close $fh 3467 close $fh
3493 or return; 3468 or return;
3494 3469
3495 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3471 and return;
3497 3472
3498 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3499 3474
3500 1 3475 1
… …
3584sub post_cleanup { 3559sub post_cleanup {
3585 my ($make_core) = @_; 3560 my ($make_core) = @_;
3586 3561
3587 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3589} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3590 3596
3591sub do_reload_perl() { 3597sub do_reload_perl() {
3592 # can/must only be called in main 3598 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3595 return; 3601 return;
3596 } 3602 }
3597 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3598 warn "reloading..."; 3607 warn "reloading...";
3599 3608
3600 warn "entering sync_job"; 3609 warn "entering sync_job";
3601 3610
3602 cf::sync_job { 3611 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3613 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3606 3615
3607 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3618
3610 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3611 3620
3612 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3624 }
3644 3625
3645 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3647 } 3628 %EXT_CORO = ();
3648 3629
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3640
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3660 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3661 } 3650 }
3662 3651
3663 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3664 } 3667 }
3665 3668
3666 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3672
3670 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3673 3676
3674 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3678 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3677 3680
3678 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3679 3682
3680 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3681 require cf; 3684 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3686
3684 warn "loading config and database again"; 3687 warn "loading config and database again";
3685 cf::reload_config; 3688 cf::reload_config;
3686 3689
3687 warn "loading extensions"; 3690 warn "loading extensions";
3688 cf::load_extensions; 3691 cf::load_extensions;
3689 3692
3690 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3696 3699
3697 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3698 3701
3699 1 3702 1
3700 } or do { 3703 } or do {
3701 warn $@; 3704 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3703 }; 3706 };
3704 3707
3705 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3706}; 3711};
3707 3712
3708our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3709 3714
3710sub reload_perl() { 3715sub reload_perl() {
… …
3847 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3848 3853
3849 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3852 async { 3858 async {
3853 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3854 3860
3855 my @bt = fork_call { 3861 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3873 }
3868 3874
3869 @funcs 3875 @funcs
3870 }; 3876 };
3871 3877
3872 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3881 --$_log_backtrace;
3875 }; 3882 };
3876 } else { 3883 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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