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.434 by root, Thu May 29 03:27:37 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;
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 ();
… …
57use Compress::LZF; 59use Compress::LZF;
58use Digest::MD5 (); 60use Digest::MD5 ();
59 61
60AnyEvent::detect; 62AnyEvent::detect;
61 63
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 64# configure various modules to our taste
65# 65#
66$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
67Coro::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
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 68
70$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}
71 87
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 89
74our %COMMAND = (); 90our %COMMAND = ();
75our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
… …
81our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
82 98
83our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
84our @EVENT; 100our @EVENT;
85 101
86our $CONFDIR = confdir; 102our $CONFDIR = confdir;
87our $DATADIR = datadir; 103our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
97our %RESOURCE; 116our %RESOURCE;
98 117
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 120our $NEXT_TICK;
… …
126 145
127binmode STDOUT; 146binmode STDOUT;
128binmode STDERR; 147binmode STDERR;
129 148
130# read virtual server time, if available 149# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
135} 154}
136 155
137mkdir $_ 156mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
245for my $pkg (qw( 264for my $pkg (qw(
246 cf::global cf::attachable 265 cf::global cf::attachable
247 cf::object cf::object::player 266 cf::object cf::object::player
248 cf::client cf::player 267 cf::client cf::player
249 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
250 cf::map cf::party cf::region 270 cf::party cf::region
251)) { 271)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 273}
255 274
256$EV::DIED = sub { 275$EV::DIED = sub {
257 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
… …
727 746
728############################################################################# 747#############################################################################
729 748
730=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
731 750
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
735 754
736In 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>
737C<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
… …
787=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
788 807
789Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
791 810
792Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 813
795These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
796 815
797=over 4 816=over 4
… …
1088 1107
1089sub reattach { 1108sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1110 my ($obj) = @_;
1092 1111
1112 # no longer needed after getting rid of delete_package?
1093 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
1094 1114
1095 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
1096 1116
1097 @$registry = (); 1117 @$registry = ();
1098 1118
… …
1334 1354
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1357
1338 $ext{source} = 1358 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1341 . $source 1361 . $source
1342 . "\n};\n1"; 1362 . "\n};\n1";
1343 1363
1344 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
… …
1384 1404
1385=back 1405=back
1386 1406
1387=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1388 1408
1389Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1390 1410
1391=cut 1411=cut
1392 1412
1393package cf::player; 1413package cf::player;
1394 1414
… …
1522 my ($pl) = @_; 1542 my ($pl) = @_;
1523 1543
1524 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1525 1545
1526 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1527 $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
1528 1548
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1550 $pl->deactivate;
1531 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;
1532 $pl->ob->check_score; 1552 $pl->ob->check_score;
… …
1618 } 1638 }
1619 1639
1620 \@paths 1640 \@paths
1621} 1641}
1622 1642
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1644
1625Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1646
1716=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1717 1648
1718Sends an ext reply to the player. 1649Sends an ext reply to the player.
1719 1650
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2020 $f->skip_block;
2090 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
2091 or return; 2022 or return;
2092 2023
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
2094 if delete $self->{load_original}; 2025 if delete $self->{load_original};
2095 2026
2096 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2028 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
… …
2533 2464
2534=item $player_object->enter_link 2465=item $player_object->enter_link
2535 2466
2536Freezes 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}>).
2537 2468
2538The 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.
2539I<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.
2540 2473
2541Will never block. 2474Will never block.
2542 2475
2543=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2544 2477
… …
2602 2535
2603 $map->load; 2536 $map->load;
2604 $map->load_neighbours; 2537 $map->load_neighbours;
2605 2538
2606 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2607 $self->activate_recursive; 2541 $self->activate_recursive;
2608 2542
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2611} 2545}
… …
2615Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2620 2557
2621=cut 2558=cut
2622 2559
2623our $GOTOGEN; 2560our $GOTOGEN;
2624 2561
… …
2771 $self->contr->savebed ($map, $x, $y) 2708 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2709 if $exit->flag (cf::FLAG_DAMNED);
2773 2710
2774 1 2711 1
2775 }) { 2712 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "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. "
2778 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2717
2781 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
… …
2870); 2807);
2871 2808
2872sub cf::client::send_msg { 2809sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2811
2875 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2876 2814
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2816
2879 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
… …
2901 if ($self->can_msg) { 2839 if ($self->can_msg) {
2902 # default colour, mask it out 2840 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2905 2843
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2907 [$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);
2908 } else { 2860 } else {
2909 if ($color >= 0) { 2861 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2911 for ($msg) { 2863 for ($msg) {
2912 1 while 2864 1 while
… …
3127=cut 3079=cut
3128 3080
3129for ( 3081for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3084 decrease split destroy change_exp)],
3133 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
3135 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
3136) { 3088) {
3137 no strict 'refs'; 3089 no strict 'refs';
… …
3398} 3350}
3399 3351
3400sub init { 3352sub init {
3401 my $guard = freeze_mainloop; 3353 my $guard = freeze_mainloop;
3402 3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3403 reload_resources; 3357 reload_resources;
3404} 3358}
3405 3359
3406sub reload_config { 3360sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3422 }; 3376 };
3423 warn $@ if $@; 3377 warn $@ if $@;
3424 } 3378 }
3425} 3379}
3426 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
3427sub main { 3400sub main {
3401 atomic;
3402
3428 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3430 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#
3431 (async { 3406 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3441 load_extensions; 3416 load_extensions;
3442 3417
3443 $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
3444 } 3419 }
3445 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
3446 EV::loop; 3426 EV::loop;
3447} 3427}
3448 3428
3449############################################################################# 3429#############################################################################
3450# initialisation and cleanup 3430# initialisation and cleanup
… …
3458 }; 3438 };
3459 } 3439 }
3460} 3440}
3461 3441
3462sub write_runtime_sync { 3442sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3467 3445
3468 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3447
3470 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3471 3449
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3451 or return;
3474 3452
3475 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3488 3466
3489 close $fh 3467 close $fh
3490 or return; 3468 or return;
3491 3469
3492 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3471 and return;
3494 3472
3495 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3496 3474
3497 1 3475 1
… …
3581sub post_cleanup { 3559sub post_cleanup {
3582 my ($make_core) = @_; 3560 my ($make_core) = @_;
3583 3561
3584 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3586} 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
3587 3596
3588sub do_reload_perl() { 3597sub do_reload_perl() {
3589 # can/must only be called in main 3598 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3592 return; 3601 return;
3593 } 3602 }
3594 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3595 warn "reloading..."; 3607 warn "reloading...";
3596 3608
3597 warn "entering sync_job"; 3609 warn "entering sync_job";
3598 3610
3599 cf::sync_job { 3611 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3613 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3603 3615
3604 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3618
3607 # 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
3608 3620
3609 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3624 }
3641 3625
3642 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3644 } 3628 %EXT_CORO = ();
3645 3629
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3640
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3657 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3658 } 3650 }
3659 3651
3660 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;
3661 } 3667 }
3662 3668
3663 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3665 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);
3666 3672
3667 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3670 3676
3671 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3678 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3674 3680
3675 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3676 3682
3677 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3678 require cf; 3684 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3686
3681 warn "loading config and database again"; 3687 warn "loading config and database again";
3682 cf::reload_config; 3688 cf::reload_config;
3683 3689
3684 warn "loading extensions"; 3690 warn "loading extensions";
3685 cf::load_extensions; 3691 cf::load_extensions;
3686 3692
3687 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3693 3699
3694 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3695 3701
3696 1 3702 1
3697 } or do { 3703 } or do {
3698 warn $@; 3704 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3700 }; 3706 };
3701 3707
3702 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3703}; 3711};
3704 3712
3705our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3706 3714
3707sub reload_perl() { 3715sub reload_perl() {
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3802 $AnyEvent::BDB::WATCHER->priority (1);
3795 3803
3796 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3811
3803 cf::sync_job { 3812 cf::sync_job {
3804 eval { 3813 eval {
… …
3830{ 3839{
3831 # configure IO::AIO 3840 # configure IO::AIO
3832 3841
3833 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3844 undef $AnyEvent::AIO::WATCHER;
3836} 3845}
3837 3846
3838my $_log_backtrace; 3847my $_log_backtrace;
3839 3848
3840sub _log_backtrace { 3849sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3844 3853
3845 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3848 async { 3858 async {
3849 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3850 3860
3851 my @bt = fork_call { 3861 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3873 }
3864 3874
3865 @funcs 3875 @funcs
3866 }; 3876 };
3867 3877
3868 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3881 --$_log_backtrace;
3871 }; 3882 };
3872 } else { 3883 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";
… …
3878# load additional modules 3889# load additional modules
3879use cf::pod; 3890use cf::pod;
3880 3891
3881END { cf::emergency_save } 3892END { cf::emergency_save }
3882 3893
3883evthread_start IO::AIO::poll_fileno;
3884
38851 38941
3886 3895

Diff Legend

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