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.438 by elmex, Sun Jul 13 20:15:51 2008 UTC vs.
Revision 1.451 by root, Mon Sep 22 05:42:41 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
69 74
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 76
72our %COMMAND = (); 77our %COMMAND = ();
73our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 81our %EXTCMD = ();
77our %EXTICMD = (); 82our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
80 85
81our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 87our @EVENT;
83 88
84our $CONFDIR = confdir; 89our $CONFDIR = confdir;
85our $DATADIR = datadir; 90our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
95our %RESOURCE; 103our %RESOURCE;
96 104
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 107our $NEXT_TICK;
… …
124 132
125binmode STDOUT; 133binmode STDOUT;
126binmode STDERR; 134binmode STDERR;
127 135
128# read virtual server time, if available 136# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
133} 141}
134 142
135mkdir $_ 143mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
243for my $pkg (qw( 251for my $pkg (qw(
244 cf::global cf::attachable 252 cf::global cf::attachable
245 cf::object cf::object::player 253 cf::object cf::object::player
246 cf::client cf::player 254 cf::client cf::player
247 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
248 cf::map cf::party cf::region 257 cf::party cf::region
249)) { 258)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 260}
253 261
254$EV::DIED = sub { 262$EV::DIED = sub {
255 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
… …
333 return;#d# 341 return;#d#
334 }#d# 342 }#d#
335 343
336 # wait for lock, if any 344 # wait for lock, if any
337 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
338 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule; 348 Coro::schedule;
340 } 349 }
341} 350}
342 351
… …
725 734
726############################################################################# 735#############################################################################
727 736
728=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
729 738
730Many objects in crossfire are so-called attachable objects. That means you can 739Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
733 742
734In the following description, CLASS can be any of C<global>, C<object> 743In 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 744C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
786 795
787Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
789 798
790Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 800that are attached at load/instantiate time, thus the need for a name.
792 801
793These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
794 803
795=over 4 804=over 4
… …
1086 1095
1087sub reattach { 1096sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1098 my ($obj) = @_;
1090 1099
1100 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1101 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1102
1093 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
1094 1104
1095 @$registry = (); 1105 @$registry = ();
1096 1106
… …
1332 1342
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1345
1336 $ext{source} = 1346 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1339 . $source 1349 . $source
1340 . "\n};\n1"; 1350 . "\n};\n1";
1341 1351
1342 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
… …
1382 1392
1383=back 1393=back
1384 1394
1385=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1386 1396
1387Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1388 1398
1389=cut 1399=cut
1390 1400
1391package cf::player; 1401package cf::player;
1392 1402
… …
1520 my ($pl) = @_; 1530 my ($pl) = @_;
1521 1531
1522 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1523 1533
1524 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1535 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1536
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1538 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1540 $pl->ob->check_score;
… …
1616 } 1626 }
1617 1627
1618 \@paths 1628 \@paths
1619} 1629}
1620 1630
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1632
1623Expand crossfire pod fragments into protocol xml. 1633Expand 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 1634
1714=item $player->ext_reply ($msgid, @msg) 1635=item $player->ext_reply ($msgid, @msg)
1715 1636
1716Sends an ext reply to the player. 1637Sends an ext reply to the player.
1717 1638
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2008 $f->skip_block;
2088 $self->_load_objects ($f) 2009 $self->_load_objects ($f)
2089 or return; 2010 or return;
2090 2011
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
2092 if delete $self->{load_original}; 2013 if delete $self->{load_original};
2093 2014
2094 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2016 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2017 unless (aio_stat $uniq) {
… …
2531 2452
2532=item $player_object->enter_link 2453=item $player_object->enter_link
2533 2454
2534Freezes the player and moves him/her to a special map (C<{link}>). 2455Freezes the player and moves him/her to a special map (C<{link}>).
2535 2456
2536The player should be reasonably safe there for short amounts of time. You 2457The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2458for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link
2460map.
2538 2461
2539Will never block. 2462Will never block.
2540 2463
2541=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2542 2465
… …
2600 2523
2601 $map->load; 2524 $map->load;
2602 $map->load_neighbours; 2525 $map->load_neighbours;
2603 2526
2604 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2529 $self->activate_recursive;
2606 2530
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2609} 2533}
… …
2772 $self->contr->savebed ($map, $x, $y) 2696 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2697 if $exit->flag (cf::FLAG_DAMNED);
2774 2698
2775 1 2699 1
2776 }) { 2700 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2702 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2705
2782 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2772 id => "infobox",
2849 title => "Body Parts", 2773 title => "Body Parts",
2850 reply => undef, 2774 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2775 tooltip => "Shows which body parts you posess and are available",
2852 }, 2776 },
2777 "c/skills" => {
2778 id => "infobox",
2779 title => "Skills",
2780 reply => undef,
2781 tooltip => "Shows your experience per skill and item power",
2782 },
2853 "c/uptime" => { 2783 "c/uptime" => {
2854 id => "infobox", 2784 id => "infobox",
2855 title => "Uptime", 2785 title => "Uptime",
2856 reply => undef, 2786 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2787 tooltip => "How long the server has been running since last restart",
… …
2871); 2801);
2872 2802
2873sub cf::client::send_msg { 2803sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2805
2876 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2877 2808
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2810
2880 # check predefined channels, for the benefit of C 2811 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2812 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2833 if ($self->can_msg) {
2903 # default colour, mask it out 2834 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2836 if $color & cf::NDI_DEF;
2906 2837
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 );
2842
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt);
2909 } else { 2854 } else {
2910 if ($color >= 0) { 2855 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2856 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2857 for ($msg) {
2913 1 while 2858 1 while
… …
3425 }; 3370 };
3426 warn $@ if $@; 3371 warn $@ if $@;
3427 } 3372 }
3428} 3373}
3429 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3430sub main { 3394sub main {
3395 atomic;
3396
3431 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3400 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3444 load_extensions; 3410 load_extensions;
3445 3411
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 } 3413 }
3448 3414
3415 utime time, time, $RUNTIMEFILE;
3416
3417 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419
3449 EV::loop; 3420 EV::loop;
3450} 3421}
3451 3422
3452############################################################################# 3423#############################################################################
3453# initialisation and cleanup 3424# initialisation and cleanup
… …
3461 }; 3432 };
3462 } 3433 }
3463} 3434}
3464 3435
3465sub write_runtime_sync { 3436sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
3470 3439
3471 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3441
3473 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
3474 3443
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3445 or return;
3477 3446
3478 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
3491 3460
3492 close $fh 3461 close $fh
3493 or return; 3462 or return;
3494 3463
3495 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3465 and return;
3497 3466
3498 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
3499 3468
3500 1 3469 1
… …
3584sub post_cleanup { 3553sub post_cleanup {
3585 my ($make_core) = @_; 3554 my ($make_core) = @_;
3586 3555
3587 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3557 if $make_core;
3558
3559 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$;
3561}
3562
3563# a safer delete_package, copied from Symbol
3564sub clear_package($) {
3565 my $pkg = shift;
3566
3567 # expand to full symbol table name if needed
3568 unless ($pkg =~ /^main::.*::$/) {
3569 $pkg = "main$pkg" if $pkg =~ /^::/;
3570 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3571 $pkg .= '::' unless $pkg =~ /::$/;
3572 }
3573
3574 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3575 my $stem_symtab = *{$stem}{HASH};
3576
3577 defined $stem_symtab and exists $stem_symtab->{$leaf}
3578 or return;
3579
3580 # clear all symbols
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 }
3586 warn "cleared package $pkg\n";#d#
3589} 3587}
3590 3588
3591sub do_reload_perl() { 3589sub do_reload_perl() {
3592 # can/must only be called in main 3590 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
3595 return; 3593 return;
3596 } 3594 }
3597 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
3598 warn "reloading..."; 3599 warn "reloading...";
3599 3600
3600 warn "entering sync_job"; 3601 warn "entering sync_job";
3601 3602
3602 cf::sync_job { 3603 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3605 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3606 3607
3607 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3610
3610 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3611 3612
3612 warn "flushing outstanding aio requests"; 3613 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; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3615 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 } 3616 }
3644 3617
3645 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
3647 } 3620 %EXT_CORO = ();
3648 3621
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3632
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3660 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3661 } 3642 }
3662 3643
3663 Symbol::delete_package $k; 3644 warn "unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647
3648 warn "... unloading $k";
3649 delete $INC{$k};
3650
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) {
3655 $cb->();
3656 }
3657
3658 clear_package $k;
3664 } 3659 }
3665 3660
3666 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3664
3670 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3673 3668
3674 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3670 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3677 3672
3678 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3679 3674
3680 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3681 require cf; 3676 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3678
3684 warn "loading config and database again"; 3679 warn "loading config and database again";
3685 cf::reload_config; 3680 cf::reload_config;
3686 3681
3687 warn "loading extensions"; 3682 warn "loading extensions";
3688 cf::load_extensions; 3683 cf::load_extensions;
3689 3684
3690 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3696 3691
3697 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3698 3693
3699 1 3694 1
3700 } or do { 3695 } or do {
3701 warn $@; 3696 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3703 }; 3698 };
3704 3699
3705 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3706}; 3703};
3707 3704
3708our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3709 3706
3710sub reload_perl() { 3707sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3713 3710
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3712 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3717 }; 3714 };
3718} 3715}
3719 3716
… …
3847 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3848 3845
3849 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3852 async { 3850 async {
3853 $Coro::current->{desc} = "abt $msg"; 3851 $Coro::current->{desc} = "abt $msg";
3854 3852
3855 my @bt = fork_call { 3853 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3865 }
3868 3866
3869 @funcs 3867 @funcs
3870 }; 3868 };
3871 3869
3872 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3873 --$_log_backtrace;
3875 }; 3874 };
3876 } else { 3875 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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