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.440 by root, Mon Aug 11 23:23:41 2008 UTC

… …
25use strict; 25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35 35
36use Coro 4.50 (); 36use Coro ();
37use Coro::State; 37use Coro::State;
38use Coro::Handle; 38use Coro::Handle;
39use Coro::EV; 39use Coro::AnyEvent;
40use Coro::Timer; 40use Coro::Timer;
41use Coro::Signal; 41use Coro::Signal;
42use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
43use Coro::AIO; 44use Coro::AIO;
44use Coro::BDB; 45use Coro::BDB 1.6;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
48use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
49use BDB (); 50use BDB ();
50use Data::Dumper; 51use Data::Dumper;
51use Digest::MD5; 52use Digest::MD5;
52use Fcntl; 53use Fcntl;
53use YAML (); 54use YAML ();
54use IO::AIO 2.51 (); 55use IO::AIO ();
55use Time::HiRes; 56use Time::HiRes;
56use Compress::LZF; 57use Compress::LZF;
57use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
58 61
59# configure various modules to our taste 62# configure various modules to our taste
60# 63#
61$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 95our %RESOURCE;
93 96
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 99our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
99 101
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 105our $DB_ENV;
105 106
… …
242for my $pkg (qw( 243for my $pkg (qw(
243 cf::global cf::attachable 244 cf::global cf::attachable
244 cf::object cf::object::player 245 cf::object cf::object::player
245 cf::client cf::player 246 cf::client cf::player
246 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
247 cf::map cf::party cf::region 249 cf::party cf::region
248)) { 250)) {
249 no strict 'refs'; 251 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 253}
252 254
… …
427 } 429 }
428 } 430 }
429}; 431};
430 432
431sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
432 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
433 437
434 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
436 440
… …
1139 utf8::decode (my $decname = $filename); 1143 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1142 1146
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1151 aio_close $fh;
1148 1152
1149 if (@$objs) { 1153 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1159 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1161 }
1158 } else { 1162 } else {
1159 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1160 } 1164 }
… …
1454 my $f = new_from_file cf::object::thawer path $login 1458 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1459 or return;
1456 1460
1457 my $pl = cf::player::load_pl $f 1461 my $pl = cf::player::load_pl $f
1458 or return; 1462 or return;
1463
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1464 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1465 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1462 } 1467 }
1463 } 1468 }
… …
1473 1478
1474 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1475 1480
1476 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1483
1484 cf::get_slot 0.01;
1478 1485
1479 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1487 cf::cede_to_tick;
1481} 1488}
1482 1489
… …
1518 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1520 1527
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1525 1534
1526 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1575
1567 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1568 my $path = path $login; 1577 my $path = path $login;
1569 1578
1570 # a .pst is a dead give-away for a valid player 1579 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1585 }
1576 1586
… …
2025 2035
2026 cf::lock_wait "map_data:$path";#d#remove 2036 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
2028 2038
2029 $cf::MAP{$path} || do { 2039 $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 2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2042
2033 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
2034 or return; 2044 or return;
2035 2045
2036 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 2049 or return;
2040 2050
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
2044 undef $guard1; 2055 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2056 $map->reset;
2047 return find $path; 2057 return find $path;
2048 } 2058 }
2049 2059
2050 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2088 $f->skip_block;
2079 $self->_load_objects ($f) 2089 $self->_load_objects ($f)
2080 or return; 2090 or return;
2081 2091
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
2083 if delete $self->{load_original}; 2093 if delete $self->{load_original};
2084 2094
2085 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2096 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2097 unless (aio_stat $uniq) {
… …
2113 } 2123 }
2114 2124
2115 $self->{last_save} = $cf::RUNTIME; 2125 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2126 $self->last_access ($cf::RUNTIME);
2117 2127
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2129 }
2120 2130
2121 $self->post_load; 2131 $self->post_load;
2122} 2132}
2123 2133
… …
2181 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2182 2192
2183 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2184 2194
2185 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2197 }
2188 2198
2189 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2190 2200
2191 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2238 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2239 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2231 }; 2241 };
2232 2242
2243 cf::get_slot 0.02;
2244
2233 if ($uniq) { 2245 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2248 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2257 $self->save;
2246 2258
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2260
2249 return if $self->players; 2261 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2252 2264
2253 $self->in_memory (cf::MAP_SWAPPED); 2265 $self->in_memory (cf::MAP_SWAPPED);
2254 2266
2255 $self->deactivate; 2267 $self->deactivate;
… …
2451can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2464dialogue with the given NPC character.
2453 2465
2454=cut 2466=cut
2455 2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2481
2456# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2483# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2486 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2499
2474 } else { 2500 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2503 }
2478 } 2504 }
2479} 2505}
2480 2506
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2588Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2616that 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 2617the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2593 2622
2594=cut 2623=cut
2595 2624
2596our $GOTOGEN; 2625our $GOTOGEN;
2597 2626
… …
2676} 2705}
2677 2706
2678sub prepare_random_map { 2707sub prepare_random_map {
2679 my ($exit) = @_; 2708 my ($exit) = @_;
2680 2709
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2712 # that depends on the exit object
2686 2713
2687 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2716 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2694 } 2723 }
2695 2724
2696 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2697 2726
2698 my $data = cf::encode_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2701 2730
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2733 undef $fh;
2705 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2706 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2709 } 2742 }
2710} 2743}
2711 2744
2712sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2714 2747
2715 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2716 2749
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; 2750 $self->enter_link;
2729 2751
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 { 2752 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2736 2754
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2739 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2740 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2741 1; 2776 1
2742 }) { 2777 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2861 id => "infobox",
2827 title => "Map Info", 2862 title => "Map Info",
2828 reply => undef, 2863 reply => undef,
2829 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2830 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2831); 2872);
2832 2873
2833sub cf::client::send_msg { 2874sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2876
… …
3072 3113
3073The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
3074 3115
3075 cf::object 3116 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3117 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3118 insert remove name archname title slaying race decrease split
3078 3119
3079 cf::object::player 3120 cf::object::player
3080 player 3121 player
3081 3122
3082 cf::player 3123 cf::player
… …
3087 3128
3088=cut 3129=cut
3089 3130
3090for ( 3131for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3134 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
3097) { 3138) {
3098 no strict 'refs'; 3139 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3347 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3348 $ns->fx_want ($k, $v);
3308 } 3349 }
3309}; 3350};
3310 3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
3361
3311sub reload_regions { 3362sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3363 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3364 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3366
… …
3328} 3379}
3329 3380
3330sub reload_archetypes { 3381sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3383 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} 3384}
3339 3385
3340sub reload_treasures { 3386sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
3343} 3389}
3344 3390
3345sub reload_resources { 3391sub reload_resources {
3346 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
3347 3393
3394 reload_facedata;
3395 reload_archetypes;
3348 reload_regions; 3396 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3397 reload_treasures;
3353 3398
3354 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3355} 3400}
3356 3401
3357sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3358 reload_resources; 3407 reload_resources;
3359} 3408}
3360 3409
3361sub reload_config { 3410sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3437 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
3390 }; 3439 };
3391 3440
3441 {
3442 my $guard = freeze_mainloop;
3392 reload_config; 3443 reload_config;
3393 db_init; 3444 db_init;
3394 load_extensions; 3445 load_extensions;
3395 3446
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3448 }
3449
3398 EV::loop; 3450 EV::loop;
3399} 3451}
3400 3452
3401############################################################################# 3453#############################################################################
3402# initialisation and cleanup 3454# initialisation and cleanup
… …
3684 3736
3685our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3687 3739
3688sub wait_for_tick { 3740sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3742
3692 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3745 $signal->wait;
3695} 3746}
3696 3747
3697sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3750
3701 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3753 $signal->wait;
3704} 3754}
… …
3743{ 3793{
3744 # configure BDB 3794 # configure BDB
3745 3795
3746 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3797 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3798 $AnyEvent::BDB::WATCHER->priority (1);
3749 3799
3750 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3807
3757 cf::sync_job { 3808 cf::sync_job {
3758 eval { 3809 eval {
… …
3784{ 3835{
3785 # configure IO::AIO 3836 # configure IO::AIO
3786 3837
3787 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3840 undef $AnyEvent::AIO::WATCHER;
3790} 3841}
3791 3842
3792my $_log_backtrace; 3843my $_log_backtrace;
3793 3844
3794sub _log_backtrace { 3845sub _log_backtrace {

Diff Legend

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