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.415 by root, Thu Apr 10 15:35:16 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
… …
1775our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1777 1789
1778sub generate_random_map { 1790sub generate_random_map {
1779 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1780 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1796 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1921
1907# the temporary/swap location 1922# the temporary/swap location
1908sub save_path { 1923sub save_path {
1909 my ($self) = @_; 1924 my ($self) = @_;
1910 1925
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1913} 1928}
1914 1929
1915# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1916sub uniq_path { 1931sub uniq_path {
1917 my ($self) = @_; 1932 my ($self) = @_;
1918 1933
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1921} 1936}
1922 1937
1923# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1924# all maps in C++... 1939# all maps in C++...
… …
2022 2037
2023 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
2025 2040
2026 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 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";
2029 2044
2030 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
2031 or return; 2046 or return;
2032 2047
2033 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 2051 or return;
2037 2052
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2041 undef $guard1; 2057 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2058 $map->reset;
2044 return find $path; 2059 return find $path;
2045 } 2060 }
2046 2061
2047 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2090 $f->skip_block;
2076 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2077 or return; 2092 or return;
2078 2093
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2080 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2081 2096
2082 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2098 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2110 } 2125 }
2111 2126
2112 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2114 2129
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2131 }
2117 2132
2118 $self->post_load; 2133 $self->post_load;
2119} 2134}
2120 2135
… …
2178 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2179 2194
2180 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2181 2196
2182 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2199 }
2185 2200
2186 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2187 2202
2188 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2240 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2228 }; 2243 };
2229 2244
2245 cf::get_slot 0.02;
2246
2230 if ($uniq) { 2247 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2250 } else {
2234 $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);
… …
2242 $self->save; 2259 $self->save;
2243 2260
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2262
2246 return if $self->players; 2263 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2249 2266
2250 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2251 2268
2252 $self->deactivate; 2269 $self->deactivate;
… …
2370 2387
2371sub unique_maps() { 2388sub unique_maps() {
2372 [ 2389 [
2373 map { 2390 map {
2374 utf8::decode $_; 2391 utf8::decode $_;
2375 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2376 ? normalise $_ 2395 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2397 ]
2380} 2398}
2381 2399
2382=back 2400=back
… …
2389 2407
2390=over 4 2408=over 4
2391 2409
2392=item $ob->inv_recursive 2410=item $ob->inv_recursive
2393 2411
2394Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2395 2414
2396=cut 2415=cut
2397 2416
2398sub inv_recursive_; 2417sub inv_recursive_;
2399sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2405} 2424}
2406 2425
2407=item $ref = $ob->ref 2426=item $ref = $ob->ref
2408 2427
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2410 2429
2411=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2412 2431
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2466dialogue with the given NPC character.
2448 2467
2449=cut 2468=cut
2450 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
2451# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2485# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2501
2469 } else { 2502 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2505 }
2473 } 2506 }
2474} 2507}
2475 2508
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2624
2589=cut 2625=cut
2590 2626
2591our $GOTOGEN; 2627our $GOTOGEN;
2592 2628
… …
2671} 2707}
2672 2708
2673sub prepare_random_map { 2709sub prepare_random_map {
2674 my ($exit) = @_; 2710 my ($exit) = @_;
2675 2711
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2714 # that depends on the exit object
2681 2715
2682 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2718 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2689 } 2725 }
2690 2726
2691 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2692 2728
2693 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2696 2732
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2735 undef $fh;
2700 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2701 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2704 } 2744 }
2705} 2745}
2706 2746
2707sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2709 2749
2710 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2711 2751
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2752 $self->enter_link;
2724 2753
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2754 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2731 2756
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2735 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
2736 1; 2778 1
2737 }) { 2779 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2821 id => "infobox", 2863 id => "infobox",
2822 title => "Map Info", 2864 title => "Map Info",
2823 reply => undef, 2865 reply => undef,
2824 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2825 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2826); 2874);
2827 2875
2828sub cf::client::send_msg { 2876sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2878
… …
3067 3115
3068The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3069 3117
3070 cf::object 3118 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3073 3121
3074 cf::object::player 3122 cf::object::player
3075 player 3123 player
3076 3124
3077 cf::player 3125 cf::player
… …
3082 3130
3083=cut 3131=cut
3084 3132
3085for ( 3133for (
3086 ["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
3087 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3092) { 3140) {
3093 no strict 'refs'; 3141 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3303 } 3351 }
3304}; 3352};
3305 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
3306sub reload_regions { 3364sub reload_regions {
3307 # 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
3308 # for this (global event?) 3366 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3368
… …
3323} 3381}
3324 3382
3325sub reload_archetypes { 3383sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3386}
3334 3387
3335sub reload_treasures { 3388sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3338} 3391}
3339 3392
3340sub reload_resources { 3393sub reload_resources {
3341 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3342 3395
3396 reload_facedata;
3397 reload_archetypes;
3343 reload_regions; 3398 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3399 reload_treasures;
3348 3400
3349 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3350} 3402}
3351 3403
3352sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3353 reload_resources; 3409 reload_resources;
3354} 3410}
3355 3411
3356sub reload_config { 3412sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3385 }; 3441 };
3386 3442
3443 {
3444 my $guard = freeze_mainloop;
3387 reload_config; 3445 reload_config;
3388 db_init; 3446 db_init;
3389 load_extensions; 3447 load_extensions;
3390 3448
3391 $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
3392 evthread_start IO::AIO::poll_fileno; 3450 }
3451
3393 EV::loop; 3452 EV::loop;
3394} 3453}
3395 3454
3396############################################################################# 3455#############################################################################
3397# initialisation and cleanup 3456# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3405 }; 3464 };
3406 } 3465 }
3407} 3466}
3408 3467
3409sub write_runtime { 3468sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3411 3470
3412 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3414 3473
… …
3440 and return; 3499 and return;
3441 3500
3442 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3443 3502
3444 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3445} 3547}
3446 3548
3447sub emergency_save() { 3549sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3449 3551
… …
3471 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3472 3574
3473 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3475 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3476 }; 3582 };
3477 3583
3478 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3479} 3585}
3480 3586
… …
3482 my ($make_core) = @_; 3588 my ($make_core) = @_;
3483 3589
3484 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3485 if $make_core; 3591 if $make_core;
3486} 3592}
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
3487 3621
3488sub do_reload_perl() { 3622sub do_reload_perl() {
3489 # can/must only be called in main 3623 # can/must only be called in main
3490 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3491 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3492 return; 3626 return;
3493 } 3627 }
3494 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3495 warn "reloading..."; 3632 warn "reloading...";
3496 3633
3497 warn "entering sync_job"; 3634 warn "entering sync_job";
3498 3635
3499 cf::sync_job { 3636 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3501 cf::emergency_save; 3638 cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3503 3640
3504 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3506 3643
3507 # 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
3508 3645
3509 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3510 for (;;) {
3511 BDB::flush;
3512 IO::AIO::flush;
3513 Coro::cede_notself;
3514 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3515 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3516 }
3517
3518 ++$RELOAD;
3519
3520 warn "cancelling all extension coros";
3521 $_->cancel for values %EXT_CORO;
3522 %EXT_CORO = ();
3523
3524 warn "removing commands";
3525 %COMMAND = ();
3526
3527 warn "removing ext/exti commands";
3528 %EXTCMD = ();
3529 %EXTICMD = ();
3530
3531 warn "unloading/nuking all extensions";
3532 for my $pkg (@EXTS) {
3533 warn "... unloading $pkg";
3534
3535 if (my $cb = $pkg->can ("unload")) {
3536 eval {
3537 $cb->($pkg);
3538 1
3539 } or warn "$pkg unloaded, but with errors: $@";
3540 } 3649 }
3541 3650
3542 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3543 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3544 } 3653 %EXT_CORO = ();
3545 3654
3546 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3547 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3548 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3549 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3550 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3551 delete $INC{$k};
3552 3665
3553 $k =~ s/\.pm$//;
3554 $k =~ s/\//::/g;
3555
3556 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3557 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3558 } 3675 }
3559 3676
3560 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;
3561 } 3692 }
3562 3693
3563 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3564 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3565 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);
3566 3697
3567 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3568 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3569 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3570 3701
3571 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3572 # and global variables created in xs 3703 # and global variables created in xs
3573 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3574 3705
3575 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3576 3707
3577 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3578 require cf; 3709 require cf;
3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3580 3711
3581 warn "loading config and database again"; 3712 warn "loading config and database again";
3582 cf::reload_config; 3713 cf::reload_config;
3583 3714
3584 warn "loading extensions"; 3715 warn "loading extensions";
3585 cf::load_extensions; 3716 cf::load_extensions;
3586 3717
3587 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3588 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3589 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3590 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3591 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3592 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3593 3724
3594 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3595 3726
3596 1 3727 1
3597 } or do { 3728 } or do {
3598 warn $@; 3729 warn $@;
3599 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3600 }; 3731 };
3601 3732
3602 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3603}; 3736};
3604 3737
3605our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3606 3739
3607sub reload_perl() { 3740sub reload_perl() {
… …
3632 3765
3633our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3634our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3635 3768
3636sub wait_for_tick { 3769sub wait_for_tick {
3637 return if tick_inhibit;
3638 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3639 3771
3640 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3641 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3642 $signal->wait; 3774 $signal->wait;
3643} 3775}
3644 3776
3645sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3646 return if tick_inhibit;
3647 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3648 3779
3649 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3650 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3651 $signal->wait; 3782 $signal->wait;
3652} 3783}
… …
3662 3793
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3665 Coro::async_pool { 3796 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 3798 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3669 }; 3800 };
3670 } 3801 }
3671 3802
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3691{ 3822{
3692 # configure BDB 3823 # configure BDB
3693 3824
3694 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3695 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3696 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3697 3828
3698 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3699 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3701 | 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;
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3704 3836
3705 cf::sync_job { 3837 cf::sync_job {
3706 eval { 3838 eval {
… …
3732{ 3864{
3733 # configure IO::AIO 3865 # configure IO::AIO
3734 3866
3735 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3736 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3737 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3738} 3870}
3739 3871
3740my $_log_backtrace; 3872my $_log_backtrace;
3741 3873
3742sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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