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.430 by root, Sun May 4 14:12:37 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 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
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";
63Compress::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
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
123 132
124binmode STDOUT; 133binmode STDOUT;
125binmode STDERR; 134binmode STDERR;
126 135
127# read virtual server time, if available 136# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
132} 141}
133 142
134mkdir $_ 143mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 251for my $pkg (qw(
243 cf::global cf::attachable 252 cf::global cf::attachable
244 cf::object cf::object::player 253 cf::object cf::object::player
245 cf::client cf::player 254 cf::client cf::player
246 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
247 cf::map cf::party cf::region 257 cf::party cf::region
248)) { 258)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 260}
252 261
253$EV::DIED = sub { 262$EV::DIED = sub {
254 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
… …
724 733
725############################################################################# 734#############################################################################
726 735
727=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
728 737
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
732 741
733In 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>
734C<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
… …
784=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
785 794
786Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
788 797
789Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 800
792These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
793 802
794=over 4 803=over 4
… …
1085 1094
1086sub reattach { 1095sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1097 my ($obj) = @_;
1089 1098
1099 # no longer needed after getting rid of delete_package?
1090 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
1091 1101
1092 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1093 1103
1094 @$registry = (); 1104 @$registry = ();
1095 1105
… …
1331 1341
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1344
1335 $ext{source} = 1345 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1338 . $source 1348 . $source
1339 . "\n};\n1"; 1349 . "\n};\n1";
1340 1350
1341 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1381 1391
1382=back 1392=back
1383 1393
1384=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1385 1395
1386Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1387 1397
1388=cut 1398=cut
1389 1399
1390package cf::player; 1400package cf::player;
1391 1401
… …
1519 my ($pl) = @_; 1529 my ($pl) = @_;
1520 1530
1521 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1522 1532
1523 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1524 $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
1525 1535
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1530 1542
1531 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1625 }
1614 1626
1615 \@paths 1627 \@paths
1616} 1628}
1617 1629
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1631
1620Expand crossfire pod fragments into protocol xml. 1632Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1633
1711=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1712 1635
1713Sends an ext reply to the player. 1636Sends an ext reply to the player.
1714 1637
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2007 $f->skip_block;
2085 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2086 or return; 2009 or return;
2087 2010
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2089 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2090 2013
2091 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2015 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2528 2451
2529=item $player_object->enter_link 2452=item $player_object->enter_link
2530 2453
2531Freezes 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}>).
2532 2455
2533The 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.
2534I<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.
2535 2460
2536Will never block. 2461Will never block.
2537 2462
2538=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2539 2464
… …
2597 2522
2598 $map->load; 2523 $map->load;
2599 $map->load_neighbours; 2524 $map->load_neighbours;
2600 2525
2601 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2528 $self->activate_recursive;
2603 2529
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2606} 2532}
… …
2610Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2539the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2615 2544
2616=cut 2545=cut
2617 2546
2618our $GOTOGEN; 2547our $GOTOGEN;
2619 2548
… …
2766 $self->contr->savebed ($map, $x, $y) 2695 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2696 if $exit->flag (cf::FLAG_DAMNED);
2768 2697
2769 1 2698 1
2770 }) { 2699 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "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. "
2773 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2704
2776 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2842 id => "infobox", 2771 id => "infobox",
2843 title => "Body Parts", 2772 title => "Body Parts",
2844 reply => undef, 2773 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2846 }, 2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2847 "c/uptime" => { 2782 "c/uptime" => {
2848 id => "infobox", 2783 id => "infobox",
2849 title => "Uptime", 2784 title => "Uptime",
2850 reply => undef, 2785 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2786 tooltip => "How long the server has been running since last restart",
… …
2865); 2800);
2866 2801
2867sub cf::client::send_msg { 2802sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2804
2870 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2871 2807
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2809
2874 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2896 if ($self->can_msg) { 2832 if ($self->can_msg) {
2897 # default colour, mask it out 2833 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2900 2836
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2902 [$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);
2903 } else { 2853 } else {
2904 if ($color >= 0) { 2854 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2906 for ($msg) { 2856 for ($msg) {
2907 1 while 2857 1 while
… …
3121 3071
3122=cut 3072=cut
3123 3073
3124for ( 3074for (
3125 ["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
3126 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3077 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3131) { 3081) {
3132 no strict 'refs'; 3082 no strict 'refs';
… …
3393} 3343}
3394 3344
3395sub init { 3345sub init {
3396 my $guard = freeze_mainloop; 3346 my $guard = freeze_mainloop;
3397 3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3398 reload_resources; 3350 reload_resources;
3399} 3351}
3400 3352
3401sub reload_config { 3353sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3417 }; 3369 };
3418 warn $@ if $@; 3370 warn $@ if $@;
3419 } 3371 }
3420} 3372}
3421 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
3422sub main { 3393sub main {
3394 atomic;
3395
3423 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
3425 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#
3426 (async { 3399 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3434 reload_config; 3407 reload_config;
3435 db_init; 3408 db_init;
3436 load_extensions; 3409 load_extensions;
3437 3410
3438 $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
3439 evthread_start IO::AIO::poll_fileno;
3440 } 3412 }
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};
3441 3418
3442 EV::loop; 3419 EV::loop;
3443} 3420}
3444 3421
3445############################################################################# 3422#############################################################################
… …
3454 }; 3431 };
3455 } 3432 }
3456} 3433}
3457 3434
3458sub write_runtime_sync { 3435sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
3463 3438
3464 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3440
3466 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
3467 3442
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3444 or return;
3470 3445
3471 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
3484 3459
3485 close $fh 3460 close $fh
3486 or return; 3461 or return;
3487 3462
3488 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3464 and return;
3490 3465
3491 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
3492 3467
3493 1 3468 1
… …
3577sub post_cleanup { 3552sub post_cleanup {
3578 my ($make_core) = @_; 3553 my ($make_core) = @_;
3579 3554
3580 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
3582} 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
3583 3589
3584sub do_reload_perl() { 3590sub do_reload_perl() {
3585 # can/must only be called in main 3591 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
3588 return; 3594 return;
3589 } 3595 }
3590 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
3591 warn "reloading..."; 3600 warn "reloading...";
3592 3601
3593 warn "entering sync_job"; 3602 warn "entering sync_job";
3594 3603
3595 cf::sync_job { 3604 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3606 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
3599 3608
3600 warn "syncing database to disk"; 3609 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3611
3603 # 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
3604 3613
3605 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3617 }
3637 3618
3638 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
3640 } 3621 %EXT_CORO = ();
3641 3622
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3633
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3653 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3654 } 3643 }
3655 3644
3656 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;
3657 } 3660 }
3658 3661
3659 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3661 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);
3662 3665
3663 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3666 3669
3667 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3671 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3670 3673
3671 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3672 3675
3673 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3674 require cf; 3677 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3679
3677 warn "loading config and database again"; 3680 warn "loading config and database again";
3678 cf::reload_config; 3681 cf::reload_config;
3679 3682
3680 warn "loading extensions"; 3683 warn "loading extensions";
3681 cf::load_extensions; 3684 cf::load_extensions;
3682 3685
3683 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3689 3692
3690 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3691 3694
3692 1 3695 1
3693 } or do { 3696 } or do {
3694 warn $@; 3697 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3696 }; 3699 };
3697 3700
3698 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3699}; 3704};
3700 3705
3701our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3702 3707
3703sub reload_perl() { 3708sub reload_perl() {
… …
3785{ 3790{
3786 # configure BDB 3791 # configure BDB
3787 3792
3788 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3794 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3795 $AnyEvent::BDB::WATCHER->priority (1);
3791 3796
3792 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | 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;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3804
3799 cf::sync_job { 3805 cf::sync_job {
3800 eval { 3806 eval {
… …
3826{ 3832{
3827 # configure IO::AIO 3833 # configure IO::AIO
3828 3834
3829 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3837 undef $AnyEvent::AIO::WATCHER;
3832} 3838}
3833 3839
3834my $_log_backtrace; 3840my $_log_backtrace;
3835 3841
3836sub _log_backtrace { 3842sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3840 3846
3841 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3844 async { 3851 async {
3845 $Coro::current->{desc} = "abt $msg"; 3852 $Coro::current->{desc} = "abt $msg";
3846 3853
3847 my @bt = fork_call { 3854 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3866 }
3860 3867
3861 @funcs 3868 @funcs
3862 }; 3869 };
3863 3870
3864 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3874 --$_log_backtrace;
3867 }; 3875 };
3868 } else { 3876 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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