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.452 by root, Tue Sep 23 00:24:52 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
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";
68Compress::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 74
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 76
74our %COMMAND = (); 77our %COMMAND = ();
75our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 81our %EXTCMD = ();
79our %EXTICMD = (); 82our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
82 85
83our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 87our @EVENT;
85 88
86our $CONFDIR = confdir; 89our $CONFDIR = confdir;
87our $DATADIR = datadir; 90our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
97our %RESOURCE; 103our %RESOURCE;
98 104
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 107our $NEXT_TICK;
… …
126 132
127binmode STDOUT; 133binmode STDOUT;
128binmode STDERR; 134binmode STDERR;
129 135
130# read virtual server time, if available 136# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
135} 141}
136 142
137mkdir $_ 143mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
245for my $pkg (qw( 251for my $pkg (qw(
246 cf::global cf::attachable 252 cf::global cf::attachable
247 cf::object cf::object::player 253 cf::object cf::object::player
248 cf::client cf::player 254 cf::client cf::player
249 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
250 cf::map cf::party cf::region 257 cf::party cf::region
251)) { 258)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 260}
255 261
256$EV::DIED = sub { 262$EV::DIED = sub {
257 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
… …
335 return;#d# 341 return;#d#
336 }#d# 342 }#d#
337 343
338 # wait for lock, if any 344 # wait for lock, if any
339 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
340 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule; 348 Coro::schedule;
342 } 349 }
343} 350}
344 351
… …
727 734
728############################################################################# 735#############################################################################
729 736
730=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
731 738
732Many objects in crossfire are so-called attachable objects. That means you can 739Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
735 742
736In the following description, CLASS can be any of C<global>, C<object> 743In 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 744C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
788 795
789Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
791 798
792Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 800that are attached at load/instantiate time, thus the need for a name.
794 801
795These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
796 803
797=over 4 804=over 4
… …
1088 1095
1089sub reattach { 1096sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1098 my ($obj) = @_;
1092 1099
1100 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1101 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1102
1095 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
1096 1104
1097 @$registry = (); 1105 @$registry = ();
1098 1106
… …
1334 1342
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1345
1338 $ext{source} = 1346 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1341 . $source 1349 . $source
1342 . "\n};\n1"; 1350 . "\n};\n1";
1343 1351
1344 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
… …
1384 1392
1385=back 1393=back
1386 1394
1387=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1388 1396
1389Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1390 1398
1391=cut 1399=cut
1392 1400
1393package cf::player; 1401package cf::player;
1394 1402
… …
1437 1445
1438sub exists($) { 1446sub exists($) {
1439 my ($login) = @_; 1447 my ($login) = @_;
1440 1448
1441 $cf::PLAYER{$login} 1449 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1450 or !aio_stat path $login
1443} 1451}
1444 1452
1445sub find($) { 1453sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1454 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1455 my $login = $_[0];
… …
1522 my ($pl) = @_; 1530 my ($pl) = @_;
1523 1531
1524 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1525 1533
1526 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1535 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1536
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1538 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1540 $pl->ob->check_score;
… …
1618 } 1626 }
1619 1627
1620 \@paths 1628 \@paths
1621} 1629}
1622 1630
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1632
1625Expand crossfire pod fragments into protocol xml. 1633Expand 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 1634
1716=item $player->ext_reply ($msgid, @msg) 1635=item $player->ext_reply ($msgid, @msg)
1717 1636
1718Sends an ext reply to the player. 1637Sends an ext reply to the player.
1719 1638
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2008 $f->skip_block;
2090 $self->_load_objects ($f) 2009 $self->_load_objects ($f)
2091 or return; 2010 or return;
2092 2011
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
2094 if delete $self->{load_original}; 2013 if delete $self->{load_original};
2095 2014
2096 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2016 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2017 unless (aio_stat $uniq) {
… …
2533 2452
2534=item $player_object->enter_link 2453=item $player_object->enter_link
2535 2454
2536Freezes the player and moves him/her to a special map (C<{link}>). 2455Freezes the player and moves him/her to a special map (C<{link}>).
2537 2456
2538The player should be reasonably safe there for short amounts of time. You 2457The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2458for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link
2460map.
2540 2461
2541Will never block. 2462Will never block.
2542 2463
2543=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2544 2465
… …
2602 2523
2603 $map->load; 2524 $map->load;
2604 $map->load_neighbours; 2525 $map->load_neighbours;
2605 2526
2606 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2607 $self->activate_recursive; 2529 $self->activate_recursive;
2608 2530
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2611} 2533}
… …
2615Moves the player to the given map-path and coordinates by first freezing 2537Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2539that 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 2540the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2541be called at the end of this process.
2542
2543Note that $check will be called with a potentially non-loaded map, so if
2544it needs a loaded map it has to call C<< ->load >>.
2620 2545
2621=cut 2546=cut
2622 2547
2623our $GOTOGEN; 2548our $GOTOGEN;
2624 2549
… …
2771 $self->contr->savebed ($map, $x, $y) 2696 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2697 if $exit->flag (cf::FLAG_DAMNED);
2773 2698
2774 1 2699 1
2775 }) { 2700 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2702 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2705
2781 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
… …
2847 id => "infobox", 2772 id => "infobox",
2848 title => "Body Parts", 2773 title => "Body Parts",
2849 reply => undef, 2774 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2775 tooltip => "Shows which body parts you posess and are available",
2851 }, 2776 },
2777 "c/skills" => {
2778 id => "infobox",
2779 title => "Skills",
2780 reply => undef,
2781 tooltip => "Shows your experience per skill and item power",
2782 },
2852 "c/uptime" => { 2783 "c/uptime" => {
2853 id => "infobox", 2784 id => "infobox",
2854 title => "Uptime", 2785 title => "Uptime",
2855 reply => undef, 2786 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2787 tooltip => "How long the server has been running since last restart",
… …
2870); 2801);
2871 2802
2872sub cf::client::send_msg { 2803sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2805
2875 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2876 2808
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2810
2879 # check predefined channels, for the benefit of C 2811 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2812 if ($CHANNEL{$channel}) {
… …
2901 if ($self->can_msg) { 2833 if ($self->can_msg) {
2902 # default colour, mask it out 2834 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2836 if $color & cf::NDI_DEF;
2905 2837
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 );
2842
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt);
2908 } else { 2854 } else {
2909 if ($color >= 0) { 2855 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones 2856 # replace some tags by gcfclient-compatible ones
2911 for ($msg) { 2857 for ($msg) {
2912 1 while 2858 1 while
… …
3127=cut 3073=cut
3128 3074
3129for ( 3075for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3076 ["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 3077 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3078 decrease split destroy change_exp)],
3133 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
3135 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
3136) { 3082) {
3137 no strict 'refs'; 3083 no strict 'refs';
… …
3398} 3344}
3399 3345
3400sub init { 3346sub init {
3401 my $guard = freeze_mainloop; 3347 my $guard = freeze_mainloop;
3402 3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3403 reload_resources; 3351 reload_resources;
3404} 3352}
3405 3353
3406sub reload_config { 3354sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3422 }; 3370 };
3423 warn $@ if $@; 3371 warn $@ if $@;
3424 } 3372 }
3425} 3373}
3426 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3427sub main { 3394sub main {
3395 atomic;
3396
3428 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3400 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3441 load_extensions; 3410 load_extensions;
3442 3411
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 } 3413 }
3445 3414
3415 utime time, time, $RUNTIMEFILE;
3416
3417 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419
3446 EV::loop; 3420 EV::loop;
3447} 3421}
3448 3422
3449############################################################################# 3423#############################################################################
3450# initialisation and cleanup 3424# initialisation and cleanup
… …
3458 }; 3432 };
3459 } 3433 }
3460} 3434}
3461 3435
3462sub write_runtime_sync { 3436sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
3467 3439
3468 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3441
3470 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
3471 3443
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3445 or return;
3474 3446
3475 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
3488 3460
3489 close $fh 3461 close $fh
3490 or return; 3462 or return;
3491 3463
3492 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3465 and return;
3494 3466
3495 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
3496 3468
3497 1 3469 1
… …
3581sub post_cleanup { 3553sub post_cleanup {
3582 my ($make_core) = @_; 3554 my ($make_core) = @_;
3583 3555
3584 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3557 if $make_core;
3558
3559 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$;
3561}
3562
3563# a safer delete_package, copied from Symbol
3564sub clear_package($) {
3565 my $pkg = shift;
3566
3567 # expand to full symbol table name if needed
3568 unless ($pkg =~ /^main::.*::$/) {
3569 $pkg = "main$pkg" if $pkg =~ /^::/;
3570 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3571 $pkg .= '::' unless $pkg =~ /::$/;
3572 }
3573
3574 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3575 my $stem_symtab = *{$stem}{HASH};
3576
3577 defined $stem_symtab and exists $stem_symtab->{$leaf}
3578 or return;
3579
3580 # clear all symbols
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 }
3586 warn "cleared package $pkg\n";#d#
3586} 3587}
3587 3588
3588sub do_reload_perl() { 3589sub do_reload_perl() {
3589 # can/must only be called in main 3590 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
3592 return; 3593 return;
3593 } 3594 }
3594 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
3595 warn "reloading..."; 3599 warn "reloading...";
3596 3600
3597 warn "entering sync_job"; 3601 warn "entering sync_job";
3598 3602
3599 cf::sync_job { 3603 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3605 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3603 3607
3604 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3610
3607 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3608 3612
3609 warn "flushing outstanding aio requests"; 3613 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; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3615 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 } 3616 }
3641 3617
3642 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
3644 } 3620 %EXT_CORO = ();
3645 3621
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3632
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3657 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3658 } 3642 }
3659 3643
3660 Symbol::delete_package $k; 3644 warn "unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647
3648 warn "... unloading $k";
3649 delete $INC{$k};
3650
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) {
3655 $cb->();
3656 }
3657
3658 clear_package $k;
3661 } 3659 }
3662 3660
3663 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3664
3667 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3670 3668
3671 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3670 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3674 3672
3675 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3676 3674
3677 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3678 require cf; 3676 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3678
3681 warn "loading config and database again"; 3679 warn "loading config and database again";
3682 cf::reload_config; 3680 cf::reload_config;
3683 3681
3684 warn "loading extensions"; 3682 warn "loading extensions";
3685 cf::load_extensions; 3683 cf::load_extensions;
3686 3684
3687 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3693 3691
3694 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3695 3693
3696 1 3694 1
3697 } or do { 3695 } or do {
3698 warn $@; 3696 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3700 }; 3698 };
3701 3699
3702 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3703}; 3703};
3704 3704
3705our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3706 3706
3707sub reload_perl() { 3707sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3710 3710
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3712 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3714 }; 3714 };
3715} 3715}
3716 3716
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3795 3795
3796 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3799 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3800 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3801 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3803
3803 cf::sync_job { 3804 cf::sync_job {
3804 eval { 3805 eval {
… …
3830{ 3831{
3831 # configure IO::AIO 3832 # configure IO::AIO
3832 3833
3833 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3836 undef $AnyEvent::AIO::WATCHER;
3836} 3837}
3837 3838
3838my $_log_backtrace; 3839my $_log_backtrace;
3839 3840
3840sub _log_backtrace { 3841sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3844 3845
3845 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3848 async { 3850 async {
3849 $Coro::current->{desc} = "abt $msg"; 3851 $Coro::current->{desc} = "abt $msg";
3850 3852
3851 my @bt = fork_call { 3853 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3865 }
3864 3866
3865 @funcs 3867 @funcs
3866 }; 3868 };
3867 3869
3868 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3873 --$_log_backtrace;
3871 }; 3874 };
3872 } else { 3875 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";
… …
3878# load additional modules 3881# load additional modules
3879use cf::pod; 3882use cf::pod;
3880 3883
3881END { cf::emergency_save } 3884END { cf::emergency_save }
3882 3885
3883evthread_start IO::AIO::poll_fileno;
3884
38851 38861
3886 3887

Diff Legend

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