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.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 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;
44use Coro::AIO; 46use Coro::AIO;
45use Coro::BDB; 47use Coro::BDB 1.6;
46use Coro::Storable; 48use Coro::Storable;
47use Coro::Util (); 49use Coro::Util ();
48 50
49use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
50use BDB (); 52use BDB ();
… …
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
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2007 $f->skip_block;
2088 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2089 or return; 2009 or return;
2090 2010
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2092 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2093 2013
2094 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2015 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
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: $@";
… …
2848 id => "infobox", 2771 id => "infobox",
2849 title => "Body Parts", 2772 title => "Body Parts",
2850 reply => undef, 2773 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2852 }, 2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2853 "c/uptime" => { 2782 "c/uptime" => {
2854 id => "infobox", 2783 id => "infobox",
2855 title => "Uptime", 2784 title => "Uptime",
2856 reply => undef, 2785 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2786 tooltip => "How long the server has been running since last restart",
… …
2871); 2800);
2872 2801
2873sub cf::client::send_msg { 2802sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2804
2876 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2877 2807
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2809
2880 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2832 if ($self->can_msg) {
2903 # default colour, mask it out 2833 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2906 2836
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2909 } else { 2853 } else {
2910 if ($color >= 0) { 2854 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2856 for ($msg) {
2913 1 while 2857 1 while
… …
3128=cut 3072=cut
3129 3073
3130for ( 3074for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3077 decrease split destroy change_exp)],
3134 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3136 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3137) { 3081) {
3138 no strict 'refs'; 3082 no strict 'refs';
… …
3425 }; 3369 };
3426 warn $@ if $@; 3370 warn $@ if $@;
3427 } 3371 }
3428} 3372}
3429 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
3430sub main { 3393sub main {
3394 atomic;
3395
3431 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3399 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3444 load_extensions; 3409 load_extensions;
3445 3410
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 } 3412 }
3448 3413
3414 utime time, time, $RUNTIMEFILE;
3415
3416 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418
3449 EV::loop; 3419 EV::loop;
3450} 3420}
3451 3421
3452############################################################################# 3422#############################################################################
3453# initialisation and cleanup 3423# initialisation and cleanup
… …
3461 }; 3431 };
3462 } 3432 }
3463} 3433}
3464 3434
3465sub write_runtime_sync { 3435sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
3470 3438
3471 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3440
3473 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
3474 3442
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3444 or return;
3477 3445
3478 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
3491 3459
3492 close $fh 3460 close $fh
3493 or return; 3461 or return;
3494 3462
3495 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3464 and return;
3497 3465
3498 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
3499 3467
3500 1 3468 1
… …
3584sub post_cleanup { 3552sub post_cleanup {
3585 my ($make_core) = @_; 3553 my ($make_core) = @_;
3586 3554
3587 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
3589} 3560}
3561
3562# a safer delete_package, copied from Symbol
3563sub clear_package($) {
3564 my $pkg = shift;
3565
3566 # expand to full symbol table name if needed
3567 unless ($pkg =~ /^main::.*::$/) {
3568 $pkg = "main$pkg" if $pkg =~ /^::/;
3569 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3570 $pkg .= '::' unless $pkg =~ /::$/;
3571 }
3572
3573 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3574 my $stem_symtab = *{$stem}{HASH};
3575
3576 defined $stem_symtab and exists $stem_symtab->{$leaf}
3577 or return;
3578
3579 # clear all symbols
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 }
3585 warn "cleared package #$pkg\n";#d#
3586}
3587
3588our $RELOAD; # how many times to reload
3590 3589
3591sub do_reload_perl() { 3590sub do_reload_perl() {
3592 # can/must only be called in main 3591 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
3595 return; 3594 return;
3596 } 3595 }
3597 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
3598 warn "reloading..."; 3600 warn "reloading...";
3599 3601
3600 warn "entering sync_job"; 3602 warn "entering sync_job";
3601 3603
3602 cf::sync_job { 3604 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3606 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
3606 3608
3607 warn "syncing database to disk"; 3609 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3611
3610 # if anything goes wrong in here, we should simply crash as we already saved 3612 # if anything goes wrong in here, we should simply crash as we already saved
3611 3613
3612 warn "flushing outstanding aio requests"; 3614 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; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3616 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 } 3617 }
3644 3618
3645 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
3647 } 3621 %EXT_CORO = ();
3648 3622
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3633
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3660 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3661 } 3643 }
3662 3644
3663 Symbol::delete_package $k; 3645 warn "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648
3649 warn "... unloading $k";
3650 delete $INC{$k};
3651
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) {
3656 $cb->();
3657 }
3658
3659 clear_package $k;
3664 } 3660 }
3665 3661
3666 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3665
3670 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3673 3669
3674 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3671 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3677 3673
3678 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3679 3675
3680 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3681 require cf; 3677 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3679
3684 warn "loading config and database again"; 3680 warn "loading config and database again";
3685 cf::reload_config; 3681 cf::reload_config;
3686 3682
3687 warn "loading extensions"; 3683 warn "loading extensions";
3688 cf::load_extensions; 3684 cf::load_extensions;
3689 3685
3690 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3696 3692
3697 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3698 3694
3699 1 3695 1
3700 } or do { 3696 } or do {
3701 warn $@; 3697 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3703 }; 3699 };
3704 3700
3705 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3706}; 3704};
3707 3705
3708our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3709 3707
3710sub reload_perl() { 3708sub reload_perl() {
… …
3796 BDB::max_poll_reqs $TICK * 0.1; 3794 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 3795 $AnyEvent::BDB::WATCHER->priority (1);
3798 3796
3799 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 | BDB::LOG_AUTOREMOVE, 1); 3800 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3801 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3803 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3804 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3805 3804
3806 cf::sync_job { 3805 cf::sync_job {
3807 eval { 3806 eval {
… …
3846 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3847 3846
3848 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3849 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3850 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3851 async { 3851 async {
3852 $Coro::current->{desc} = "abt $msg"; 3852 $Coro::current->{desc} = "abt $msg";
3853 3853
3854 my @bt = fork_call { 3854 my @bt = fork_call {
3855 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
… …
3866 } 3866 }
3867 3867
3868 @funcs 3868 @funcs
3869 }; 3869 };
3870 3870
3871 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 3874 --$_log_backtrace;
3874 }; 3875 };
3875 } else { 3876 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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