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

Diff Legend

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