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.447 by root, Fri Sep 19 01:39:45 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
… …
76our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
77 82
78our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
79our @EVENT; 84our @EVENT;
80 85
81our $CONFDIR = confdir; 86our $CONFDIR = confdir;
82our $DATADIR = datadir; 87our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
92our %RESOURCE; 100our %RESOURCE;
93 101
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 104our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
99 106
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 110our $DB_ENV;
105 111
… …
123 129
124binmode STDOUT; 130binmode STDOUT;
125binmode STDERR; 131binmode STDERR;
126 132
127# read virtual server time, if available 133# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
132} 138}
133 139
134mkdir $_ 140mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 248for my $pkg (qw(
243 cf::global cf::attachable 249 cf::global cf::attachable
244 cf::object cf::object::player 250 cf::object cf::object::player
245 cf::client cf::player 251 cf::client cf::player
246 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
247 cf::map cf::party cf::region 254 cf::party cf::region
248)) { 255)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 257}
252 258
253$EV::DIED = sub { 259$EV::DIED = sub {
254 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
… …
724 730
725############################################################################# 731#############################################################################
726 732
727=head2 ATTACHABLE OBJECTS 733=head2 ATTACHABLE OBJECTS
728 734
729Many objects in crossfire are so-called attachable objects. That means you can 735Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
732 738
733In the following description, CLASS can be any of C<global>, C<object> 739In 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 740C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 790=item cf::CLASS::attachment $name, ...
785 791
786Register an attachment by C<$name> through which attachable objects of the 792Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 793given CLASS can refer to this attachment.
788 794
789Some classes such as crossfire maps and objects can specify attachments 795Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 796that are attached at load/instantiate time, thus the need for a name.
791 797
792These calls expect any number of the following handler/hook descriptions: 798These calls expect any number of the following handler/hook descriptions:
793 799
794=over 4 800=over 4
… …
1085 1091
1086sub reattach { 1092sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1094 my ($obj) = @_;
1089 1095
1096 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1098
1092 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1093 1100
1094 @$registry = (); 1101 @$registry = ();
1095 1102
… …
1331 1338
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1341
1335 $ext{source} = 1342 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1338 . $source 1345 . $source
1339 . "\n};\n1"; 1346 . "\n};\n1";
1340 1347
1341 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1381 1388
1382=back 1389=back
1383 1390
1384=head2 CORE EXTENSIONS 1391=head2 CORE EXTENSIONS
1385 1392
1386Functions and methods that extend core crossfire objects. 1393Functions and methods that extend core deliantra objects.
1387 1394
1388=cut 1395=cut
1389 1396
1390package cf::player; 1397package cf::player;
1391 1398
… …
1519 my ($pl) = @_; 1526 my ($pl) = @_;
1520 1527
1521 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1522 1529
1523 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1532
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1534 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score; 1536 $pl->ob->check_score;
… …
1615 } 1622 }
1616 1623
1617 \@paths 1624 \@paths
1618} 1625}
1619 1626
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($cfpod)
1621 1628
1622Expand crossfire pod fragments into protocol xml. 1629Expand 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 1630
1713=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1714 1632
1715Sends an ext reply to the player. 1633Sends an ext reply to the player.
1716 1634
… …
2085 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block; 2004 $f->skip_block;
2087 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2088 or return; 2006 or return;
2089 2007
2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2091 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2092 2010
2093 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2094 utf8::encode $uniq; 2012 utf8::encode $uniq;
2095 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2530 2448
2531=item $player_object->enter_link 2449=item $player_object->enter_link
2532 2450
2533Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2534 2452
2535The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2536I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2537 2457
2538Will never block. 2458Will never block.
2539 2459
2540=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2541 2461
… …
2599 2519
2600 $map->load; 2520 $map->load;
2601 $map->load_neighbours; 2521 $map->load_neighbours;
2602 2522
2603 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2604 $self->activate_recursive; 2525 $self->activate_recursive;
2605 2526
2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2607 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2608} 2529}
… …
2612Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2613her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2614that has to return the map if sucecssful, and then unfreezes the player on 2535that 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 2536the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process. 2537be called at the end of this process.
2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2617 2541
2618=cut 2542=cut
2619 2543
2620our $GOTOGEN; 2544our $GOTOGEN;
2621 2545
… …
2768 $self->contr->savebed ($map, $x, $y) 2692 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED); 2693 if $exit->flag (cf::FLAG_DAMNED);
2770 2694
2771 1 2695 1
2772 }) { 2696 }) {
2773 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2774 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2775 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2776 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2777 2701
2778 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
… …
2867); 2791);
2868 2792
2869sub cf::client::send_msg { 2793sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2871 2795
2872 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg)
2797 unless $color & cf::NDI_VERBATIM;
2873 2798
2874 $color &= cf::NDI_CLIENT_MASK; # just in case... 2799 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875 2800
2876 # check predefined channels, for the benefit of C 2801 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) { 2802 if ($CHANNEL{$channel}) {
… …
2898 if ($self->can_msg) { 2823 if ($self->can_msg) {
2899 # default colour, mask it out 2824 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF; 2826 if $color & cf::NDI_DEF;
2902 2827
2903 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2828 my $pkt = "msg "
2829 . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 );
2832
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt);
2905 } else { 2844 } else {
2906 if ($color >= 0) { 2845 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones 2846 # replace some tags by gcfclient-compatible ones
2908 for ($msg) { 2847 for ($msg) {
2909 1 while 2848 1 while
… …
3124=cut 3063=cut
3125 3064
3126for ( 3065for (
3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3066 ["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 3067 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)], 3068 decrease split destroy change_exp)],
3130 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
3132 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
3133) { 3072) {
3134 no strict 'refs'; 3073 no strict 'refs';
… …
3395} 3334}
3396 3335
3397sub init { 3336sub init {
3398 my $guard = freeze_mainloop; 3337 my $guard = freeze_mainloop;
3399 3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3400 reload_resources; 3341 reload_resources;
3401} 3342}
3402 3343
3403sub reload_config { 3344sub reload_config {
3404 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3419 }; 3360 };
3420 warn $@ if $@; 3361 warn $@ if $@;
3421 } 3362 }
3422} 3363}
3423 3364
3365sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!";
3368 flock $fh, &Fcntl::LOCK_EX
3369 or die "$PIDFILE: flock: $!";
3370 $fh
3371}
3372
3373# make sure only one server instance is running at any one time
3374sub atomic {
3375 my $fh = pidfile;
3376
3377 my $pid = <$fh>;
3378 kill 9, $pid if $pid > 0;
3379
3380 seek $fh, 0, 0;
3381 print $fh $$;
3382}
3383
3424sub main { 3384sub main {
3385 atomic;
3386
3425 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
3426 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3428 (async { 3390 (async {
3429 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3436 reload_config; 3398 reload_config;
3437 db_init; 3399 db_init;
3438 load_extensions; 3400 load_extensions;
3439 3401
3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 } 3403 }
3404
3405 utime time, time, $RUNTIMEFILE;
3406
3407 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3409
3444 EV::loop; 3410 EV::loop;
3445} 3411}
3446 3412
3447############################################################################# 3413#############################################################################
… …
3456 }; 3422 };
3457 } 3423 }
3458} 3424}
3459 3425
3460sub write_runtime_sync { 3426sub write_runtime_sync {
3461 my $runtime = "$LOCALDIR/runtime";
3462
3463 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
3465 3429
3466 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3431
3468 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
3469 3433
3470 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3471 or return; 3435 or return;
3472 3436
3473 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
… …
3485 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
3486 3450
3487 close $fh 3451 close $fh
3488 or return; 3452 or return;
3489 3453
3490 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3455 and return;
3492 3456
3493 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
3494 3458
3495 1 3459 1
… …
3579sub post_cleanup { 3543sub post_cleanup {
3580 my ($make_core) = @_; 3544 my ($make_core) = @_;
3581 3545
3582 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
3583 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
3584} 3551}
3552
3553# a safer delete_package, copied from Symbol
3554sub clear_package($) {
3555 my $pkg = shift;
3556
3557 # expand to full symbol table name if needed
3558 unless ($pkg =~ /^main::.*::$/) {
3559 $pkg = "main$pkg" if $pkg =~ /^::/;
3560 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3561 $pkg .= '::' unless $pkg =~ /::$/;
3562 }
3563
3564 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3565 my $stem_symtab = *{$stem}{HASH};
3566
3567 defined $stem_symtab and exists $stem_symtab->{$leaf}
3568 or return;
3569
3570 # clear all symbols
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 }
3576 warn "cleared package #$pkg\n";#d#
3577}
3578
3579our $RELOAD; # how many times to reload
3585 3580
3586sub do_reload_perl() { 3581sub do_reload_perl() {
3587 # can/must only be called in main 3582 # can/must only be called in main
3588 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
3589 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
3590 return; 3585 return;
3591 } 3586 }
3592 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
3593 warn "reloading..."; 3591 warn "reloading...";
3594 3592
3595 warn "entering sync_job"; 3593 warn "entering sync_job";
3596 3594
3597 cf::sync_job { 3595 cf::sync_job {
3598 cf::write_runtime_sync; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3599 cf::emergency_save; 3597 cf::emergency_save;
3600 cf::write_runtime_sync; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3601 3599
3602 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3604 3602
3605 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3606 3604
3607 warn "flushing outstanding aio requests"; 3605 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; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
3613 warn "iterate..."; 3607 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 } 3608 }
3639 3609
3640 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
3641 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
3642 } 3612 %EXT_CORO = ();
3643 3613
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
3645 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3648 warn "... unloading $k"; 3623 warn "... unloading $pkg";
3649 delete $INC{$k};
3650 3624
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3655 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
3656 } 3634 }
3657 3635
3658 Symbol::delete_package $k; 3636 warn "unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639
3640 warn "... unloading $k";
3641 delete $INC{$k};
3642
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) {
3647 $cb->();
3648 }
3649
3650 clear_package $k;
3659 } 3651 }
3660 3652
3661 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
3662 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3656
3665 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
3668 3660
3669 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3662 # and global variables created in xs
3671 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
3672 3664
3673 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
3674 3666
3675 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3676 require cf; 3668 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3678 3670
3679 warn "loading config and database again"; 3671 warn "loading config and database again";
3680 cf::reload_config; 3672 cf::reload_config;
3681 3673
3682 warn "loading extensions"; 3674 warn "loading extensions";
3683 cf::load_extensions; 3675 cf::load_extensions;
3684 3676
3685 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3691 3683
3692 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3693 3685
3694 1 3686 1
3695 } or do { 3687 } or do {
3696 warn $@; 3688 warn $@;
3697 cf::cleanup "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3698 }; 3690 };
3699 3691
3700 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3701}; 3695};
3702 3696
3703our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3704 3698
3705sub reload_perl() { 3699sub reload_perl() {
… …
3787{ 3781{
3788 # configure BDB 3782 # configure BDB
3789 3783
3790 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3791 BDB::max_poll_reqs $TICK * 0.1; 3785 BDB::max_poll_reqs $TICK * 0.1;
3792 $Coro::BDB::WATCHER->priority (1); 3786 $AnyEvent::BDB::WATCHER->priority (1);
3793 3787
3794 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3795 $DB_ENV = BDB::db_env_create; 3789 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3797 | BDB::LOG_AUTOREMOVE, 1); 3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3792 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3794 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3800 3795
3801 cf::sync_job { 3796 cf::sync_job {
3802 eval { 3797 eval {
… …
3828{ 3823{
3829 # configure IO::AIO 3824 # configure IO::AIO
3830 3825
3831 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3832 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3833 $Coro::AIO::WATCHER->priority (1); 3828 undef $AnyEvent::AIO::WATCHER;
3834} 3829}
3835 3830
3836my $_log_backtrace; 3831my $_log_backtrace;
3837 3832
3838sub _log_backtrace { 3833sub _log_backtrace {
… …
3841 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3842 3837
3843 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3844 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3845 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3846 async { 3842 async {
3847 $Coro::current->{desc} = "abt $msg"; 3843 $Coro::current->{desc} = "abt $msg";
3848 3844
3849 my @bt = fork_call { 3845 my @bt = fork_call {
3850 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
… …
3861 } 3857 }
3862 3858
3863 @funcs 3859 @funcs
3864 }; 3860 };
3865 3861
3866 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 3865 --$_log_backtrace;
3869 }; 3866 };
3870 } else { 3867 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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