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.419 by root, Sun Apr 13 01:34:09 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: @_";
… …
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
432 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
433 438
434 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
436 441
… …
1083 1088
1084sub reattach { 1089sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1091 my ($obj) = @_;
1087 1092
1093 # no longer needed after getting rid of delete_package?
1088 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
1089 1095
1090 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1091 1097
1092 @$registry = (); 1098 @$registry = ();
1093 1099
… …
1139 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1142 1148
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1153 aio_close $fh;
1148 1154
1149 if (@$objs) { 1155 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1161 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1163 }
1158 } else { 1164 } else {
1159 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1160 } 1166 }
… …
1329 1335
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1338
1333 $ext{source} = 1339 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1336 . $source 1342 . $source
1337 . "\n};\n1"; 1343 . "\n};\n1";
1338 1344
1339 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1454 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1461 or return;
1456 1462
1457 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1458 or return; 1464 or return;
1465
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1462 } 1469 }
1463 } 1470 }
… …
1473 1480
1474 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1475 1482
1476 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1478 1487
1479 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1489 cf::cede_to_tick;
1481} 1490}
1482 1491
… …
1518 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1519 $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
1520 1529
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1525 1536
1526 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1577
1567 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1568 my $path = path $login; 1579 my $path = path $login;
1569 1580
1570 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1587 }
1576 1588
… …
2025 2037
2026 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
2028 2040
2029 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 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";
2032 2044
2033 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
2034 or return; 2046 or return;
2035 2047
2036 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 2051 or return;
2040 2052
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2044 undef $guard1; 2057 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2058 $map->reset;
2047 return find $path; 2059 return find $path;
2048 } 2060 }
2049 2061
2050 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2090 $f->skip_block;
2079 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2080 or return; 2092 or return;
2081 2093
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2083 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2084 2096
2085 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2098 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2113 } 2125 }
2114 2126
2115 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2117 2129
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2131 }
2120 2132
2121 $self->post_load; 2133 $self->post_load;
2122} 2134}
2123 2135
… …
2181 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2182 2194
2183 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2184 2196
2185 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2199 }
2188 2200
2189 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2190 2202
2191 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2240 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2231 }; 2243 };
2232 2244
2245 cf::get_slot 0.02;
2246
2233 if ($uniq) { 2247 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2250 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2259 $self->save;
2246 2260
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2262
2249 return if $self->players; 2263 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2252 2266
2253 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2254 2268
2255 $self->deactivate; 2269 $self->deactivate;
… …
2451can 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
2452dialogue with the given NPC character. 2466dialogue with the given NPC character.
2453 2467
2454=cut 2468=cut
2455 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
2456# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2485# with dialog boxes.
2458#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
2459sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2472 $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));
2473 2501
2474 } else { 2502 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2505 }
2478 } 2506 }
2479} 2507}
2480 2508
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2588Moves 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
2589her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2590that 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
2591the 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
2592be 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 >>.
2593 2624
2594=cut 2625=cut
2595 2626
2596our $GOTOGEN; 2627our $GOTOGEN;
2597 2628
… …
2676} 2707}
2677 2708
2678sub prepare_random_map { 2709sub prepare_random_map {
2679 my ($exit) = @_; 2710 my ($exit) = @_;
2680 2711
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2714 # that depends on the exit object
2686 2715
2687 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2718 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2694 } 2725 }
2695 2726
2696 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2697 2728
2698 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2701 2732
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2735 undef $fh;
2705 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2706 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2709 } 2744 }
2710} 2745}
2711 2746
2712sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2714 2749
2715 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2716 2751
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2752 $self->enter_link;
2729 2753
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2754 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2736 2756
2737 $self->deactivate_recursive; # just to be sure
2738 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
2739 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2740 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
2741 1; 2778 1
2742 }) { 2779 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "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. "
2745 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2863 id => "infobox",
2827 title => "Map Info", 2864 title => "Map Info",
2828 reply => undef, 2865 reply => undef,
2829 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2830 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2831); 2874);
2832 2875
2833sub cf::client::send_msg { 2876sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2878
… …
3072 3115
3073The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3074 3117
3075 cf::object 3118 cf::object
3076 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
3077 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3078 3121
3079 cf::object::player 3122 cf::object::player
3080 player 3123 player
3081 3124
3082 cf::player 3125 cf::player
… …
3087 3130
3088=cut 3131=cut
3089 3132
3090for ( 3133for (
3091 ["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
3092 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3097) { 3140) {
3098 no strict 'refs'; 3141 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3308 } 3351 }
3309}; 3352};
3310 3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
3311sub reload_regions { 3364sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3366 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3368
… …
3328} 3381}
3329 3382
3330sub reload_archetypes { 3383sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3386}
3339 3387
3340sub reload_treasures { 3388sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3343} 3391}
3344 3392
3345sub reload_resources { 3393sub reload_resources {
3346 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3347 3395
3396 reload_facedata;
3397 reload_archetypes;
3348 reload_regions; 3398 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3399 reload_treasures;
3353 3400
3354 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3355} 3402}
3356 3403
3357sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3358 reload_resources; 3409 reload_resources;
3359} 3410}
3360 3411
3361sub reload_config { 3412sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3390 }; 3441 };
3391 3442
3443 {
3444 my $guard = freeze_mainloop;
3392 reload_config; 3445 reload_config;
3393 db_init; 3446 db_init;
3394 load_extensions; 3447 load_extensions;
3395 3448
3396 $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
3397 evthread_start IO::AIO::poll_fileno; 3450 }
3451
3398 EV::loop; 3452 EV::loop;
3399} 3453}
3400 3454
3401############################################################################# 3455#############################################################################
3402# initialisation and cleanup 3456# initialisation and cleanup
… …
3535 3589
3536 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3591 if $make_core;
3538} 3592}
3539 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
3540sub do_reload_perl() { 3622sub do_reload_perl() {
3541 # can/must only be called in main 3623 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3544 return; 3626 return;
3545 } 3627 }
3546 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3547 warn "reloading..."; 3632 warn "reloading...";
3548 3633
3549 warn "entering sync_job"; 3634 warn "entering sync_job";
3550 3635
3551 cf::sync_job { 3636 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3638 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3555 3640
3556 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3643
3559 # 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
3560 3645
3561 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = ();
3575
3576 warn "removing commands";
3577 %COMMAND = ();
3578
3579 warn "removing ext/exti commands";
3580 %EXTCMD = ();
3581 %EXTICMD = ();
3582
3583 warn "unloading/nuking all extensions";
3584 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg";
3586
3587 if (my $cb = $pkg->can ("unload")) {
3588 eval {
3589 $cb->($pkg);
3590 1
3591 } or warn "$pkg unloaded, but with errors: $@";
3592 } 3649 }
3593 3650
3594 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3596 } 3653 %EXT_CORO = ();
3597 3654
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3665
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3609 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3610 } 3675 }
3611 3676
3612 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;
3613 } 3692 }
3614 3693
3615 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3617 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);
3618 3697
3619 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3622 3701
3623 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3703 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3626 3705
3627 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3628 3707
3629 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3630 require cf; 3709 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3711
3633 warn "loading config and database again"; 3712 warn "loading config and database again";
3634 cf::reload_config; 3713 cf::reload_config;
3635 3714
3636 warn "loading extensions"; 3715 warn "loading extensions";
3637 cf::load_extensions; 3716 cf::load_extensions;
3638 3717
3639 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3645 3724
3646 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3647 3726
3648 1 3727 1
3649 } or do { 3728 } or do {
3650 warn $@; 3729 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3652 }; 3731 };
3653 3732
3654 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3655}; 3736};
3656 3737
3657our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3658 3739
3659sub reload_perl() { 3740sub reload_perl() {
… …
3684 3765
3685our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3687 3768
3688sub wait_for_tick { 3769sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3771
3692 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3774 $signal->wait;
3695} 3775}
3696 3776
3697sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3779
3701 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3782 $signal->wait;
3704} 3783}
… …
3743{ 3822{
3744 # configure BDB 3823 # configure BDB
3745 3824
3746 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3749 3828
3750 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | 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;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3836
3757 cf::sync_job { 3837 cf::sync_job {
3758 eval { 3838 eval {
… …
3784{ 3864{
3785 # configure IO::AIO 3865 # configure IO::AIO
3786 3866
3787 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3790} 3870}
3791 3871
3792my $_log_backtrace; 3872my $_log_backtrace;
3793 3873
3794sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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