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

Diff Legend

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