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.431 by elmex, Sun May 4 19:27:27 2008 UTC vs.
Revision 1.446 by root, Tue Sep 16 16:03:02 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: @_";
… …
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;
… …
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;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1530 1539
1531 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1616} 1625}
1617 1626
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1619 1628
1620Expand crossfire pod fragments into protocol xml. 1629Expand crossfire 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 1630
1711=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1712 1632
1713Sends an ext reply to the player. 1633Sends an ext reply to the player.
1714 1634
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2004 $f->skip_block;
2085 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2086 or return; 2006 or return;
2087 2007
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2089 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2090 2010
2091 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2012 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2528 2448
2529=item $player_object->enter_link 2449=item $player_object->enter_link
2530 2450
2531Freezes 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}>).
2532 2452
2533The 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.
2534I<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.
2535 2457
2536Will never block. 2458Will never block.
2537 2459
2538=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2539 2461
… …
2597 2519
2598 $map->load; 2520 $map->load;
2599 $map->load_neighbours; 2521 $map->load_neighbours;
2600 2522
2601 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2525 $self->activate_recursive;
2603 2526
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2606} 2529}
… …
2610Moves 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
2611her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2612that 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
2613the 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
2614be 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 >>.
2615 2541
2616=cut 2542=cut
2617 2543
2618our $GOTOGEN; 2544our $GOTOGEN;
2619 2545
… …
2896 if ($self->can_msg) { 2822 if ($self->can_msg) {
2897 # default colour, mask it out 2823 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2825 if $color & cf::NDI_DEF;
2900 2826
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2827 my $pkt = "msg "
2828 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 );
2831
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt);
2903 } else { 2843 } else {
2904 if ($color >= 0) { 2844 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones 2845 # replace some tags by gcfclient-compatible ones
2906 for ($msg) { 2846 for ($msg) {
2907 1 while 2847 1 while
… …
3122=cut 3062=cut
3123 3063
3124for ( 3064for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv nrof name archname title slaying race 3066 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3067 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3068 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3069 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3070 ["cf::map" => qw(trigger)],
3131) { 3071) {
3132 no strict 'refs'; 3072 no strict 'refs';
… …
3393} 3333}
3394 3334
3395sub init { 3335sub init {
3396 my $guard = freeze_mainloop; 3336 my $guard = freeze_mainloop;
3397 3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3398 reload_resources; 3340 reload_resources;
3399} 3341}
3400 3342
3401sub reload_config { 3343sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3344 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3417 }; 3359 };
3418 warn $@ if $@; 3360 warn $@ if $@;
3419 } 3361 }
3420} 3362}
3421 3363
3364sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!";
3367 flock $fh, &Fcntl::LOCK_EX
3368 or die "$PIDFILE: flock: $!";
3369 $fh
3370}
3371
3372# make sure only one server instance is running at any one time
3373sub atomic {
3374 my $fh = pidfile;
3375
3376 my $pid = <$fh>;
3377 kill 9, $pid if $pid > 0;
3378
3379 seek $fh, 0, 0;
3380 print $fh $$;
3381}
3382
3422sub main { 3383sub main {
3384 atomic;
3385
3423 # we must not ever block the main coroutine 3386 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3387 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3389 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3390 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3434 reload_config; 3397 reload_config;
3435 db_init; 3398 db_init;
3436 load_extensions; 3399 load_extensions;
3437 3400
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 } 3402 }
3403
3404 utime time, time, $RUNTIMEFILE;
3405
3406 # no (long-running) fork's whatsoever before this point(!)
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3408
3442 EV::loop; 3409 EV::loop;
3443} 3410}
3444 3411
3445############################################################################# 3412#############################################################################
… …
3454 }; 3421 };
3455 } 3422 }
3456} 3423}
3457 3424
3458sub write_runtime_sync { 3425sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3426 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3427 # the fsync below can take a very very long time.
3463 3428
3464 IO::AIO::aio_utime $runtime, undef, undef; 3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3430
3466 my $guard = cf::lock_acquire "write_runtime"; 3431 my $guard = cf::lock_acquire "write_runtime";
3467 3432
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3434 or return;
3470 3435
3471 my $value = $cf::RUNTIME + 90 + 10; 3436 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3437 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3438 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3448 aio_utime $fh, undef, undef;
3484 3449
3485 close $fh 3450 close $fh
3486 or return; 3451 or return;
3487 3452
3488 aio_rename "$runtime~", $runtime 3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3454 and return;
3490 3455
3491 warn "runtime file written.\n"; 3456 warn "runtime file written.\n";
3492 3457
3493 1 3458 1
… …
3577sub post_cleanup { 3542sub post_cleanup {
3578 my ($make_core) = @_; 3543 my ($make_core) = @_;
3579 3544
3580 warn Carp::longmess "post_cleanup backtrace" 3545 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3546 if $make_core;
3547
3548 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$;
3582} 3550}
3551
3552# a safer delete_package, copied from Symbol
3553sub clear_package($) {
3554 my $pkg = shift;
3555
3556 # expand to full symbol table name if needed
3557 unless ($pkg =~ /^main::.*::$/) {
3558 $pkg = "main$pkg" if $pkg =~ /^::/;
3559 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3560 $pkg .= '::' unless $pkg =~ /::$/;
3561 }
3562
3563 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3564 my $stem_symtab = *{$stem}{HASH};
3565
3566 defined $stem_symtab and exists $stem_symtab->{$leaf}
3567 or return;
3568
3569 # clear all symbols
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 }
3575 warn "cleared package #$pkg\n";#d#
3576}
3577
3578our $RELOAD; # how many times to reload
3583 3579
3584sub do_reload_perl() { 3580sub do_reload_perl() {
3585 # can/must only be called in main 3581 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3582 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3583 warn "can only reload from main coroutine";
3588 return; 3584 return;
3589 } 3585 }
3590 3586
3587 return if $RELOAD++;
3588
3589 while ($RELOAD) {
3591 warn "reloading..."; 3590 warn "reloading...";
3592 3591
3593 warn "entering sync_job"; 3592 warn "entering sync_job";
3594 3593
3595 cf::sync_job { 3594 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3595 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3596 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3597 cf::write_runtime_sync; # external watchdog should not bark
3599 3598
3600 warn "syncing database to disk"; 3599 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3600 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3601
3603 # if anything goes wrong in here, we should simply crash as we already saved 3602 # if anything goes wrong in here, we should simply crash as we already saved
3604 3603
3605 warn "flushing outstanding aio requests"; 3604 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; 3605 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3606 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 } 3607 }
3637 3608
3638 warn "... nuking $pkg"; 3609 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3610 $_->cancel for values %EXT_CORO;
3640 } 3611 %EXT_CORO = ();
3641 3612
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3613 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3614 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3615
3616 warn "removing ext/exti commands";
3617 %EXTCMD = ();
3618 %EXTICMD = ();
3619
3620 warn "unloading/nuking all extensions";
3621 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3622 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3623
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3624 if (my $cb = $pkg->can ("unload")) {
3625 eval {
3653 $cb->(); 3626 $cb->($pkg);
3627 1
3628 } or warn "$pkg unloaded, but with errors: $@";
3629 }
3630
3631 warn "... clearing $pkg";
3632 clear_package $pkg;
3654 } 3633 }
3655 3634
3656 Symbol::delete_package $k; 3635 warn "unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638
3639 warn "... unloading $k";
3640 delete $INC{$k};
3641
3642 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g;
3644
3645 if (my $cb = $k->can ("unload_module")) {
3646 $cb->();
3647 }
3648
3649 clear_package $k;
3657 } 3650 }
3658 3651
3659 warn "getting rid of safe::, as good as possible"; 3652 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3653 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3655
3663 warn "unloading cf.pm \"a bit\""; 3656 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3657 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3658 delete $INC{"cf/pod.pm"};
3666 3659
3667 # don't, removes xs symbols, too, 3660 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3661 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3662 #clear_package __PACKAGE__;
3670 3663
3671 warn "unload completed, starting to reload now"; 3664 warn "unload completed, starting to reload now";
3672 3665
3673 warn "reloading cf.pm"; 3666 warn "reloading cf.pm";
3674 require cf; 3667 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3669
3677 warn "loading config and database again"; 3670 warn "loading config and database again";
3678 cf::reload_config; 3671 cf::reload_config;
3679 3672
3680 warn "loading extensions"; 3673 warn "loading extensions";
3681 cf::load_extensions; 3674 cf::load_extensions;
3682 3675
3683 warn "reattaching attachments to objects/players"; 3676 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3677 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3678 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3679 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3680 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3681 reattach $_ for values %PLAYER;
3689 3682
3690 warn "leaving sync_job"; 3683 warn "leaving sync_job";
3691 3684
3692 1 3685 1
3693 } or do { 3686 } or do {
3694 warn $@; 3687 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3688 cf::cleanup "error while reloading, exiting.";
3696 }; 3689 };
3697 3690
3698 warn "reloaded"; 3691 warn "reloaded";
3692 --$RELOAD;
3693 }
3699}; 3694};
3700 3695
3701our $RELOAD_WATCHER; # used only during reload 3696our $RELOAD_WATCHER; # used only during reload
3702 3697
3703sub reload_perl() { 3698sub reload_perl() {
… …
3785{ 3780{
3786 # configure BDB 3781 # configure BDB
3787 3782
3788 BDB::min_parallel 8; 3783 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3784 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3785 $AnyEvent::BDB::WATCHER->priority (1);
3791 3786
3792 unless ($DB_ENV) { 3787 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3788 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3789 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3790 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3791 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3792 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3794
3799 cf::sync_job { 3795 cf::sync_job {
3800 eval { 3796 eval {
… …
3826{ 3822{
3827 # configure IO::AIO 3823 # configure IO::AIO
3828 3824
3829 IO::AIO::min_parallel 8; 3825 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3826 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3827 undef $AnyEvent::AIO::WATCHER;
3832} 3828}
3833 3829
3834my $_log_backtrace; 3830my $_log_backtrace;
3835 3831
3836sub _log_backtrace { 3832sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3835 $msg =~ s/\n//;
3840 3836
3841 # limit the # of concurrent backtraces 3837 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3838 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3839 ++$_log_backtrace;
3840 my $perl_bt = Carp::longmess $msg;
3844 async { 3841 async {
3845 $Coro::current->{desc} = "abt $msg"; 3842 $Coro::current->{desc} = "abt $msg";
3846 3843
3847 my @bt = fork_call { 3844 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3845 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3856 }
3860 3857
3861 @funcs 3858 @funcs
3862 }; 3859 };
3863 3860
3864 LOG llevInfo, "[ABT] $msg\n"; 3861 LOG llevInfo, "[ABT] $perl_bt\n";
3862 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3863 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3864 --$_log_backtrace;
3867 }; 3865 };
3868 } else { 3866 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3867 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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