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.449 by root, Sat Sep 20 00:09:27 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 = ();
… …
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
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: @_";
… …
725 733
726############################################################################# 734#############################################################################
727 735
728=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
729 737
730Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
733 741
734In the following description, CLASS can be any of C<global>, C<object> 742In 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 743C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
786 794
787Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
789 797
790Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
792 800
793These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
794 802
795=over 4 803=over 4
… …
1086 1094
1087sub reattach { 1095sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1097 my ($obj) = @_;
1090 1098
1099 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1101
1093 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1094 1103
1095 @$registry = (); 1104 @$registry = ();
1096 1105
… …
1332 1341
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1344
1336 $ext{source} = 1345 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1339 . $source 1348 . $source
1340 . "\n};\n1"; 1349 . "\n};\n1";
1341 1350
1342 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1382 1391
1383=back 1392=back
1384 1393
1385=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1386 1395
1387Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1388 1397
1389=cut 1398=cut
1390 1399
1391package cf::player; 1400package cf::player;
1392 1401
… …
1520 my ($pl) = @_; 1529 my ($pl) = @_;
1521 1530
1522 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1523 1532
1524 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1535
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1537 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1539 $pl->ob->check_score;
… …
1616 } 1625 }
1617 1626
1618 \@paths 1627 \@paths
1619} 1628}
1620 1629
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1631
1623Expand crossfire pod fragments into protocol xml. 1632Expand 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 1633
1714=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1715 1635
1716Sends an ext reply to the player. 1636Sends an ext reply to the player.
1717 1637
… …
2531 2451
2532=item $player_object->enter_link 2452=item $player_object->enter_link
2533 2453
2534Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2535 2455
2536The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2538 2460
2539Will never block. 2461Will never block.
2540 2462
2541=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2542 2464
… …
2600 2522
2601 $map->load; 2523 $map->load;
2602 $map->load_neighbours; 2524 $map->load_neighbours;
2603 2525
2604 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2528 $self->activate_recursive;
2606 2529
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2609} 2532}
… …
2772 $self->contr->savebed ($map, $x, $y) 2695 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2696 if $exit->flag (cf::FLAG_DAMNED);
2774 2697
2775 1 2698 1
2776 }) { 2699 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2704
2782 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2871); 2794);
2872 2795
2873sub cf::client::send_msg { 2796sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2797 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2798
2876 $msg = $self->pl->expand_cfpod ($msg); 2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2877 2801
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2803
2880 # check predefined channels, for the benefit of C 2804 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2805 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2826 if ($self->can_msg) {
2903 # default colour, mask it out 2827 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2829 if $color & cf::NDI_DEF;
2906 2830
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 );
2835
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt);
2909 } else { 2847 } else {
2910 if ($color >= 0) { 2848 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2849 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2850 for ($msg) {
2913 1 while 2851 1 while
… …
3425 }; 3363 };
3426 warn $@ if $@; 3364 warn $@ if $@;
3427 } 3365 }
3428} 3366}
3429 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3430sub main { 3387sub main {
3388 atomic;
3389
3431 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3393 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3444 load_extensions; 3403 load_extensions;
3445 3404
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 } 3406 }
3448 3407
3408 utime time, time, $RUNTIMEFILE;
3409
3410 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412
3449 EV::loop; 3413 EV::loop;
3450} 3414}
3451 3415
3452############################################################################# 3416#############################################################################
3453# initialisation and cleanup 3417# initialisation and cleanup
… …
3461 }; 3425 };
3462 } 3426 }
3463} 3427}
3464 3428
3465sub write_runtime_sync { 3429sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3470 3432
3471 IO::AIO::aio_utime $runtime, undef, undef; 3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3434
3473 my $guard = cf::lock_acquire "write_runtime"; 3435 my $guard = cf::lock_acquire "write_runtime";
3474 3436
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3438 or return;
3477 3439
3478 my $value = $cf::RUNTIME + 90 + 10; 3440 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3441 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3442 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3452 aio_utime $fh, undef, undef;
3491 3453
3492 close $fh 3454 close $fh
3493 or return; 3455 or return;
3494 3456
3495 aio_rename "$runtime~", $runtime 3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3458 and return;
3497 3459
3498 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3499 3461
3500 1 3462 1
… …
3584sub post_cleanup { 3546sub post_cleanup {
3585 my ($make_core) = @_; 3547 my ($make_core) = @_;
3586 3548
3587 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
3589} 3554}
3555
3556# a safer delete_package, copied from Symbol
3557sub clear_package($) {
3558 my $pkg = shift;
3559
3560 # expand to full symbol table name if needed
3561 unless ($pkg =~ /^main::.*::$/) {
3562 $pkg = "main$pkg" if $pkg =~ /^::/;
3563 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3564 $pkg .= '::' unless $pkg =~ /::$/;
3565 }
3566
3567 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3568 my $stem_symtab = *{$stem}{HASH};
3569
3570 defined $stem_symtab and exists $stem_symtab->{$leaf}
3571 or return;
3572
3573 # clear all symbols
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 }
3579 warn "cleared package #$pkg\n";#d#
3580}
3581
3582our $RELOAD; # how many times to reload
3590 3583
3591sub do_reload_perl() { 3584sub do_reload_perl() {
3592 # can/must only be called in main 3585 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
3595 return; 3588 return;
3596 } 3589 }
3597 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
3598 warn "reloading..."; 3594 warn "reloading...";
3599 3595
3600 warn "entering sync_job"; 3596 warn "entering sync_job";
3601 3597
3602 cf::sync_job { 3598 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3600 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3606 3602
3607 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3605
3610 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3611 3607
3612 warn "flushing outstanding aio requests"; 3608 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; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3610 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 } 3611 }
3644 3612
3645 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
3647 } 3615 %EXT_CORO = ();
3648 3616
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3626 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3627
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
3660 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
3661 } 3637 }
3662 3638
3663 Symbol::delete_package $k; 3639 warn "unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642
3643 warn "... unloading $k";
3644 delete $INC{$k};
3645
3646 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g;
3648
3649 if (my $cb = $k->can ("unload_module")) {
3650 $cb->();
3651 }
3652
3653 clear_package $k;
3664 } 3654 }
3665 3655
3666 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3659
3670 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
3673 3663
3674 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3665 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
3677 3667
3678 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
3679 3669
3680 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
3681 require cf; 3671 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3673
3684 warn "loading config and database again"; 3674 warn "loading config and database again";
3685 cf::reload_config; 3675 cf::reload_config;
3686 3676
3687 warn "loading extensions"; 3677 warn "loading extensions";
3688 cf::load_extensions; 3678 cf::load_extensions;
3689 3679
3690 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
3696 3686
3697 warn "leaving sync_job"; 3687 warn "leaving sync_job";
3698 3688
3699 1 3689 1
3700 } or do { 3690 } or do {
3701 warn $@; 3691 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
3703 }; 3693 };
3704 3694
3705 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
3706}; 3698};
3707 3699
3708our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
3709 3701
3710sub reload_perl() { 3702sub reload_perl() {
… …
3847 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
3848 3840
3849 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3852 async { 3845 async {
3853 $Coro::current->{desc} = "abt $msg"; 3846 $Coro::current->{desc} = "abt $msg";
3854 3847
3855 my @bt = fork_call { 3848 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3860 }
3868 3861
3869 @funcs 3862 @funcs
3870 }; 3863 };
3871 3864
3872 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3868 --$_log_backtrace;
3875 }; 3869 };
3876 } else { 3870 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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