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.424 by root, Sun Apr 20 05:24:55 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
… …
1141 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1144 1148
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1153 aio_close $fh;
1150 1154
1151 if (@$objs) { 1155 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1161 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1163 }
1160 } else { 1164 } else {
1161 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1162 } 1166 }
… …
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;
… …
1456 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1461 or return;
1458 1462
1459 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1460 or return; 1464 or return;
1465
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1464 } 1469 }
1465 } 1470 }
… …
1522 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1523 $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
1524 1529
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1529 1536
1530 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1577
1571 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1572 my $path = path $login; 1579 my $path = path $login;
1573 1580
1574 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1587 }
1580 1588
… …
2029 2037
2030 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
2032 2040
2033 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 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";
2036 2044
2037 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
2038 or return; 2046 or return;
2039 2047
2040 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 2051 or return;
2044 2052
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2048 undef $guard1; 2057 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2058 $map->reset;
2051 return find $path; 2059 return find $path;
2052 } 2060 }
2053 2061
2054 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2090 $f->skip_block;
2083 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2084 or return; 2092 or return;
2085 2093
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2087 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2088 2096
2089 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2098 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2457can 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
2458dialogue with the given NPC character. 2466dialogue with the given NPC character.
2459 2467
2460=cut 2468=cut
2461 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
2462# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2485# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2501
2480 } else { 2502 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2505 }
2484 } 2506 }
2485} 2507}
2486 2508
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2624
2600=cut 2625=cut
2601 2626
2602our $GOTOGEN; 2627our $GOTOGEN;
2603 2628
… …
2682} 2707}
2683 2708
2684sub prepare_random_map { 2709sub prepare_random_map {
2685 my ($exit) = @_; 2710 my ($exit) = @_;
2686 2711
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2714 # that depends on the exit object
2692 2715
2693 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2718 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2700 } 2725 }
2701 2726
2702 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2703 2728
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2735 undef $fh;
2711 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2712 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2715 } 2744 }
2716} 2745}
2717 2746
2718sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2720 2749
2721 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2722 2751
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2752 $self->enter_link;
2735 2753
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2754 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2742 2756
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2746 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
2747 1; 2778 1
2748 }) { 2779 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2832 id => "infobox", 2863 id => "infobox",
2833 title => "Map Info", 2864 title => "Map Info",
2834 reply => undef, 2865 reply => undef,
2835 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2836 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2837); 2874);
2838 2875
2839sub cf::client::send_msg { 2876sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2878
… …
3078 3115
3079The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3080 3117
3081 cf::object 3118 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3084 3121
3085 cf::object::player 3122 cf::object::player
3086 player 3123 player
3087 3124
3088 cf::player 3125 cf::player
… …
3093 3130
3094=cut 3131=cut
3095 3132
3096for ( 3133for (
3097 ["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
3098 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3103) { 3140) {
3104 no strict 'refs'; 3141 no strict 'refs';
… …
3364 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3365} 3402}
3366 3403
3367sub init { 3404sub init {
3368 my $guard = freeze_mainloop; 3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3369 3408
3370 reload_resources; 3409 reload_resources;
3371} 3410}
3372 3411
3373sub reload_config { 3412sub reload_config {
… …
3406 reload_config; 3445 reload_config;
3407 db_init; 3446 db_init;
3408 load_extensions; 3447 load_extensions;
3409 3448
3410 $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
3411 evthread_start IO::AIO::poll_fileno;
3412 } 3450 }
3413 3451
3414 EV::loop; 3452 EV::loop;
3415} 3453}
3416 3454
… …
3551 3589
3552 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 3591 if $make_core;
3554} 3592}
3555 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
3556sub do_reload_perl() { 3622sub do_reload_perl() {
3557 # can/must only be called in main 3623 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3559 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3560 return; 3626 return;
3561 } 3627 }
3562 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3563 warn "reloading..."; 3632 warn "reloading...";
3564 3633
3565 warn "entering sync_job"; 3634 warn "entering sync_job";
3566 3635
3567 cf::sync_job { 3636 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3638 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3571 3640
3572 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3574 3643
3575 # 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
3576 3645
3577 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3583 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = ();
3591
3592 warn "removing commands";
3593 %COMMAND = ();
3594
3595 warn "removing ext/exti commands";
3596 %EXTCMD = ();
3597 %EXTICMD = ();
3598
3599 warn "unloading/nuking all extensions";
3600 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg";
3602
3603 if (my $cb = $pkg->can ("unload")) {
3604 eval {
3605 $cb->($pkg);
3606 1
3607 } or warn "$pkg unloaded, but with errors: $@";
3608 } 3649 }
3609 3650
3610 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3611 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3612 } 3653 %EXT_CORO = ();
3613 3654
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3615 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3618 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3619 delete $INC{$k};
3620 3665
3621 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g;
3623
3624 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3625 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3626 } 3675 }
3627 3676
3628 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;
3629 } 3692 }
3630 3693
3631 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3633 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);
3634 3697
3635 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3638 3701
3639 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3703 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3642 3705
3643 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3644 3707
3645 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3646 require cf; 3709 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3648 3711
3649 warn "loading config and database again"; 3712 warn "loading config and database again";
3650 cf::reload_config; 3713 cf::reload_config;
3651 3714
3652 warn "loading extensions"; 3715 warn "loading extensions";
3653 cf::load_extensions; 3716 cf::load_extensions;
3654 3717
3655 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3661 3724
3662 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3663 3726
3664 1 3727 1
3665 } or do { 3728 } or do {
3666 warn $@; 3729 warn $@;
3667 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3668 }; 3731 };
3669 3732
3670 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3671}; 3736};
3672 3737
3673our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3674 3739
3675sub reload_perl() { 3740sub reload_perl() {
… …
3757{ 3822{
3758 # configure BDB 3823 # configure BDB
3759 3824
3760 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3761 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3763 3828
3764 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | 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;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 3836
3771 cf::sync_job { 3837 cf::sync_job {
3772 eval { 3838 eval {
… …
3798{ 3864{
3799 # configure IO::AIO 3865 # configure IO::AIO
3800 3866
3801 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3804} 3870}
3805 3871
3806my $_log_backtrace; 3872my $_log_backtrace;
3807 3873
3808sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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