ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 97our %RESOURCE;
93 98
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 101our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
99 103
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 107our $DB_ENV;
105 108
… …
242for my $pkg (qw( 245for my $pkg (qw(
243 cf::global cf::attachable 246 cf::global cf::attachable
244 cf::object cf::object::player 247 cf::object cf::object::player
245 cf::client cf::player 248 cf::client cf::player
246 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
247 cf::map cf::party cf::region 251 cf::party cf::region
248)) { 252)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 254}
252 255
253$EV::DIED = sub { 256$EV::DIED = sub {
254 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
1085 1088
1086sub reattach { 1089sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1091 my ($obj) = @_;
1089 1092
1093 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1095
1092 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1093 1097
1094 @$registry = (); 1098 @$registry = ();
1095 1099
… …
1331 1335
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1338
1335 $ext{source} = 1339 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1338 . $source 1342 . $source
1339 . "\n};\n1"; 1343 . "\n};\n1";
1340 1344
1341 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1523 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1525 1529
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1530 1536
1531 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1619 1625
1620Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1621 1627
1622=cut 1628=cut
1623 1629
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 { 1630sub expand_cfpod {
1636 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1637 1632
1633 my @nest = [qr<\G$>, undef, ""];
1638 my $xml; 1634 my $xml;
1639 1635
1636 for ($pod) {
1640 while () { 1637 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group; 1639 $xml .= $1;
1648 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1649 ([BCGHITU]) 1641 $xml .= " ";
1650 < 1642 } elsif (/\G\n/xgcs) {
1651 (?: 1643 $xml .= "\n";
1652 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1653 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1654 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1655 > 1647 $delim = qr{\G\Q$delim};
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659 1648
1649 my $cb;
1650
1660 if ($code eq "B") { 1651 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</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") { 1653 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1668 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1670 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1671 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1672 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1673 $xml .= expand_cfpod ($self, $data); 1661 };
1674 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", 1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "") 1667 "",
1678 [$self->{hintmode}]; 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1679 } else { 1699 } else {
1680 $xml .= "error processing '$code($data)' directive"; 1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1681 } 1707 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 } 1708 }
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 } 1709 }
1700 1710
1701 $xml 1711 $xml
1702} 1712}
1703
1704no re 'eval';
1705 1713
1706sub hintmode { 1714sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode} 1716 $_[0]{hintmode}
1709} 1717}
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2092 $f->skip_block;
2085 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2086 or return; 2094 or return;
2087 2095
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2089 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2090 2098
2091 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2100 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2610Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2620that 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 2621the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2615 2626
2616=cut 2627=cut
2617 2628
2618our $GOTOGEN; 2629our $GOTOGEN;
2619 2630
… …
3121 3132
3122=cut 3133=cut
3123 3134
3124for ( 3135for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3138 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
3131) { 3142) {
3132 no strict 'refs'; 3143 no strict 'refs';
… …
3392 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3393} 3404}
3394 3405
3395sub init { 3406sub init {
3396 my $guard = freeze_mainloop; 3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3397 3410
3398 reload_resources; 3411 reload_resources;
3399} 3412}
3400 3413
3401sub reload_config { 3414sub reload_config {
… …
3434 reload_config; 3447 reload_config;
3435 db_init; 3448 db_init;
3436 load_extensions; 3449 load_extensions;
3437 3450
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 } 3452 }
3441 3453
3442 EV::loop; 3454 EV::loop;
3443} 3455}
3444 3456
… …
3579 3591
3580 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3593 if $make_core;
3582} 3594}
3583 3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3623
3584sub do_reload_perl() { 3624sub do_reload_perl() {
3585 # can/must only be called in main 3625 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3588 return; 3628 return;
3589 } 3629 }
3590 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3591 warn "reloading..."; 3634 warn "reloading...";
3592 3635
3593 warn "entering sync_job"; 3636 warn "entering sync_job";
3594 3637
3595 cf::sync_job { 3638 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3640 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3599 3642
3600 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3645
3603 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3604 3647
3605 warn "flushing outstanding aio requests"; 3648 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; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3650 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 } 3651 }
3637 3652
3638 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3640 } 3655 %EXT_CORO = ();
3641 3656
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3667
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3653 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3654 } 3677 }
3655 3678
3656 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3657 } 3694 }
3658 3695
3659 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3699
3663 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3666 3703
3667 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3705 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3670 3707
3671 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3672 3709
3673 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3674 require cf; 3711 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3713
3677 warn "loading config and database again"; 3714 warn "loading config and database again";
3678 cf::reload_config; 3715 cf::reload_config;
3679 3716
3680 warn "loading extensions"; 3717 warn "loading extensions";
3681 cf::load_extensions; 3718 cf::load_extensions;
3682 3719
3683 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3689 3726
3690 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3691 3728
3692 1 3729 1
3693 } or do { 3730 } or do {
3694 warn $@; 3731 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3696 }; 3733 };
3697 3734
3698 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3699}; 3738};
3700 3739
3701our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3702 3741
3703sub reload_perl() { 3742sub reload_perl() {
… …
3785{ 3824{
3786 # configure BDB 3825 # configure BDB
3787 3826
3788 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3829 $AnyEvent::BDB::WATCHER->priority (1);
3791 3830
3792 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3838
3799 cf::sync_job { 3839 cf::sync_job {
3800 eval { 3840 eval {
… …
3826{ 3866{
3827 # configure IO::AIO 3867 # configure IO::AIO
3828 3868
3829 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3871 undef $AnyEvent::AIO::WATCHER;
3832} 3872}
3833 3873
3834my $_log_backtrace; 3874my $_log_backtrace;
3835 3875
3836sub _log_backtrace { 3876sub _log_backtrace {

Diff Legend

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