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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 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~";
… …
2031 2037
2032 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
2034 2040
2035 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2044
2039 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
2040 or return; 2046 or return;
2041 2047
2042 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
2045 or return; 2051 or return;
2046 2052
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2050 undef $guard1; 2057 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2058 $map->reset;
2053 return find $path; 2059 return find $path;
2054 } 2060 }
2055 2061
2056 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2090 $f->skip_block;
2085 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2086 or return; 2092 or return;
2087 2093
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2089 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2090 2096
2091 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2098 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2459can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2466dialogue with the given NPC character.
2461 2467
2462=cut 2468=cut
2463 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2464# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2485# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2479 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2501
2482 } else { 2502 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2505 }
2486 } 2506 }
2487} 2507}
2488 2508
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2596Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2601 2624
2602=cut 2625=cut
2603 2626
2604our $GOTOGEN; 2627our $GOTOGEN;
2605 2628
… …
2684} 2707}
2685 2708
2686sub prepare_random_map { 2709sub prepare_random_map {
2687 my ($exit) = @_; 2710 my ($exit) = @_;
2688 2711
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2714 # that depends on the exit object
2694 2715
2695 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2697 if ($exit->map) { 2718 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2702 } 2725 }
2703 2726
2704 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2705 2728
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2735 undef $fh;
2713 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2714 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2717 } 2744 }
2718} 2745}
2719 2746
2720sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2722 2749
2723 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2724 2751
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2752 $self->enter_link;
2737 2753
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2754 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2744 2756
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2747 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2748 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2749 1; 2778 1
2750 }) { 2779 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2752 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
3101 3130
3102=cut 3131=cut
3103 3132
3104for ( 3133for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3136 decrease split destroy change_exp)],
3108 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3110 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3111) { 3140) {
3112 no strict 'refs'; 3141 no strict 'refs';
… …
3372 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3373} 3402}
3374 3403
3375sub init { 3404sub init {
3376 my $guard = freeze_mainloop; 3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3377 3408
3378 reload_resources; 3409 reload_resources;
3379} 3410}
3380 3411
3381sub reload_config { 3412sub reload_config {
… …
3414 reload_config; 3445 reload_config;
3415 db_init; 3446 db_init;
3416 load_extensions; 3447 load_extensions;
3417 3448
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 } 3450 }
3421 3451
3422 EV::loop; 3452 EV::loop;
3423} 3453}
3424 3454
… …
3559 3589
3560 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3591 if $make_core;
3562} 3592}
3563 3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3621
3564sub do_reload_perl() { 3622sub do_reload_perl() {
3565 # can/must only be called in main 3623 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3567 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3568 return; 3626 return;
3569 } 3627 }
3570 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3571 warn "reloading..."; 3632 warn "reloading...";
3572 3633
3573 warn "entering sync_job"; 3634 warn "entering sync_job";
3574 3635
3575 cf::sync_job { 3636 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3638 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3579 3640
3580 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3643
3583 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3584 3645
3585 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3649 }
3617 3650
3618 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3620 } 3653 %EXT_CORO = ();
3621 3654
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3665
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3633 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3634 } 3675 }
3635 3676
3636 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3637 } 3692 }
3638 3693
3639 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 3697
3643 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3646 3701
3647 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3703 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3650 3705
3651 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3652 3707
3653 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3654 require cf; 3709 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3656 3711
3657 warn "loading config and database again"; 3712 warn "loading config and database again";
3658 cf::reload_config; 3713 cf::reload_config;
3659 3714
3660 warn "loading extensions"; 3715 warn "loading extensions";
3661 cf::load_extensions; 3716 cf::load_extensions;
3662 3717
3663 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3669 3724
3670 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3671 3726
3672 1 3727 1
3673 } or do { 3728 } or do {
3674 warn $@; 3729 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3676 }; 3731 };
3677 3732
3678 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3679}; 3736};
3680 3737
3681our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3682 3739
3683sub reload_perl() { 3740sub reload_perl() {
… …
3765{ 3822{
3766 # configure BDB 3823 # configure BDB
3767 3824
3768 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3771 3828
3772 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3836
3779 cf::sync_job { 3837 cf::sync_job {
3780 eval { 3838 eval {
… …
3806{ 3864{
3807 # configure IO::AIO 3865 # configure IO::AIO
3808 3866
3809 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3812} 3870}
3813 3871
3814my $_log_backtrace; 3872my $_log_backtrace;
3815 3873
3816sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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