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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
23use Coro::BDB; 45use Coro::BDB 1.6;
24use Coro::Storable; 46use Coro::Storable;
25use Coro::Util (); 47use Coro::Util ();
26 48
27use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
28use BDB (); 50use BDB ();
29use Data::Dumper; 51use Data::Dumper;
30use Digest::MD5; 52use Digest::MD5;
31use Fcntl; 53use Fcntl;
32use YAML (); 54use YAML ();
33use IO::AIO 2.51 (); 55use IO::AIO ();
34use Time::HiRes; 56use Time::HiRes;
35use Compress::LZF; 57use Compress::LZF;
36use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
37 61
38# configure various modules to our taste 62# configure various modules to our taste
39# 63#
40$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
41Coro::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
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 95our %RESOURCE;
72 96
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 99our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
79 101
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 105our $DB_ENV;
85 106
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
… …
339 361
340 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
341} 363}
342 364
343sub freeze_mainloop { 365sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
345 367
346 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 369}
352 370
353=item cf::periodic $interval, $cb 371=item cf::periodic $interval, $cb
354 372
355Like EV::periodic, but randomly selects a starting point so that the actions 373Like EV::periodic, but randomly selects a starting point so that the actions
… …
410 } 428 }
411 } 429 }
412}; 430};
413 431
414sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
415 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
416 436
417 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
419 439
… …
456 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
458 478
459 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
460 480
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
464 482
465 my $busy = 1; 483 my $busy = 1;
466 my @res; 484 my @res;
467 485
… …
478 } else { 496 } else {
479 EV::loop EV::LOOP_ONESHOT; 497 EV::loop EV::LOOP_ONESHOT;
480 } 498 }
481 } 499 }
482 500
483 $time = EV::time - $time; 501 my $time = EV::time - $time;
484 502
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
489 504
490 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
491 } else { 506 } else {
492 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
493 508
… …
535 reset_signals; 550 reset_signals;
536 &$cb 551 &$cb
537 }, @args; 552 }, @args;
538 553
539 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
540} 582}
541 583
542=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
543 585
544Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
1100 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1103 1145
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1150 aio_close $fh;
1109 1151
1110 if (@$objs) { 1152 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1158 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1160 }
1119 } else { 1161 } else {
1120 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1121 } 1163 }
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1318 1360
1319 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1362 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1364 }
1324 1365
1325 warn $msg; 1366 warn $msg;
1326 } 1367 }
1327 1368
… …
1416 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1458 or return;
1418 1459
1419 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1420 or return; 1461 or return;
1462
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1424 } 1466 }
1425 } 1467 }
… …
1435 1477
1436 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1437 1479
1438 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1440 1484
1441 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1486 cf::cede_to_tick;
1443} 1487}
1444 1488
… …
1480 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1481 $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
1482 1526
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1487 1533
1488 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1528 1574
1529 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1530 my $path = path $login; 1576 my $path = path $login;
1531 1577
1532 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1584 }
1538 1585
… …
1737our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1739 1786
1740sub generate_random_map { 1787sub generate_random_map {
1741 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1742 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1793 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1918
1869# the temporary/swap location 1919# the temporary/swap location
1870sub save_path { 1920sub save_path {
1871 my ($self) = @_; 1921 my ($self) = @_;
1872 1922
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1875} 1925}
1876 1926
1877# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1878sub uniq_path { 1928sub uniq_path {
1879 my ($self) = @_; 1929 my ($self) = @_;
1880 1930
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1883} 1933}
1884 1934
1885# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1886# all maps in C++... 1936# all maps in C++...
… …
1984 2034
1985 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1987 2037
1988 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 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";
1991 2041
1992 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1993 or return; 2043 or return;
1994 2044
1995 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1998 or return; 2048 or return;
1999 2049
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2003 undef $guard1; 2054 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2055 $map->reset;
2006 return find $path; 2056 return find $path;
2007 } 2057 }
2008 2058
2009 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2087 $f->skip_block;
2038 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2039 or return; 2089 or return;
2040 2090
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2042 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2043 2093
2044 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2095 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
… …
2072 } 2122 }
2073 2123
2074 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2076 2126
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2128 }
2079 2129
2080 $self->post_load; 2130 $self->post_load;
2081} 2131}
2082 2132
… …
2140 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2141 2191
2142 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2143 2193
2144 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2196 }
2147 2197
2148 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2149 2199
2150 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2237 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2190 }; 2240 };
2191 2241
2242 cf::get_slot 0.02;
2243
2192 if ($uniq) { 2244 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2247 } else {
2196 $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);
… …
2204 $self->save; 2256 $self->save;
2205 2257
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2259
2208 return if $self->players; 2260 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2211 2263
2212 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2213 2265
2214 $self->deactivate; 2266 $self->deactivate;
… …
2332 2384
2333sub unique_maps() { 2385sub unique_maps() {
2334 [ 2386 [
2335 map { 2387 map {
2336 utf8::decode $_; 2388 utf8::decode $_;
2337 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2338 ? normalise $_ 2392 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2394 ]
2342} 2395}
2343 2396
2344package cf;
2345
2346=back 2397=back
2347 2398
2348=head3 cf::object 2399=head3 cf::object
2349 2400
2350=cut 2401=cut
… …
2353 2404
2354=over 4 2405=over 4
2355 2406
2356=item $ob->inv_recursive 2407=item $ob->inv_recursive
2357 2408
2358Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2359 2411
2360=cut 2412=cut
2361 2413
2362sub inv_recursive_; 2414sub inv_recursive_;
2363sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2369} 2421}
2370 2422
2371=item $ref = $ob->ref 2423=item $ref = $ob->ref
2372 2424
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2374 2426
2375=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2376 2428
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2410can 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
2411dialogue with the given NPC character. 2463dialogue with the given NPC character.
2412 2464
2413=cut 2465=cut
2414 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
2415# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2482# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2430 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2498
2433 } else { 2499 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2502 }
2437 } 2503 }
2438} 2504}
2439 2505
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2547Moves 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
2548her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2549that 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
2550the 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
2551be 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 >>.
2552 2621
2553=cut 2622=cut
2554 2623
2555our $GOTOGEN; 2624our $GOTOGEN;
2556 2625
… …
2635} 2704}
2636 2705
2637sub prepare_random_map { 2706sub prepare_random_map {
2638 my ($exit) = @_; 2707 my ($exit) = @_;
2639 2708
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2711 # that depends on the exit object
2645 2712
2646 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2648 if ($exit->map) { 2715 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2653 } 2722 }
2654 2723
2655 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2656 2725
2657 my $data = cf::encode_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2660 2729
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2732 undef $fh;
2664 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2665 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2668 } 2741 }
2669} 2742}
2670 2743
2671sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2673 2746
2674 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2675 2748
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2749 $self->enter_link;
2688 2750
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2751 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2695 2753
2696 $self->deactivate_recursive; # just to be sure
2697 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
2698 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2699 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
2700 1; 2775 1
2701 }) { 2776 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2785 id => "infobox", 2860 id => "infobox",
2786 title => "Map Info", 2861 title => "Map Info",
2787 reply => undef, 2862 reply => undef,
2788 tooltip => "Information related to the maps", 2863 tooltip => "Information related to the maps",
2789 }, 2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2790); 2871);
2791 2872
2792sub cf::client::send_msg { 2873sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2875
… …
3031 3112
3032The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
3033 3114
3034 cf::object 3115 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
3037 3118
3038 cf::object::player 3119 cf::object::player
3039 player 3120 player
3040 3121
3041 cf::player 3122 cf::player
… …
3046 3127
3047=cut 3128=cut
3048 3129
3049for ( 3130for (
3050 ["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
3051 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3133 decrease split destroy change_exp)],
3053 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3056) { 3137) {
3057 no strict 'refs'; 3138 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3267 } 3348 }
3268}; 3349};
3269 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
3270sub reload_regions { 3361sub reload_regions {
3271 # 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
3272 # for this (global event?) 3363 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3365
… …
3287} 3378}
3288 3379
3289sub reload_archetypes { 3380sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3383}
3298 3384
3299sub reload_treasures { 3385sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3302} 3388}
3303 3389
3304sub reload_resources { 3390sub reload_resources {
3305 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3306 3392
3393 reload_facedata;
3394 reload_archetypes;
3307 reload_regions; 3395 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3396 reload_treasures;
3312 3397
3313 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3314} 3399}
3315 3400
3316sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3317 reload_resources; 3406 reload_resources;
3318} 3407}
3319 3408
3320sub reload_config { 3409sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3349 }; 3438 };
3350 3439
3440 {
3441 my $guard = freeze_mainloop;
3351 reload_config; 3442 reload_config;
3352 db_init; 3443 db_init;
3353 load_extensions; 3444 load_extensions;
3354 3445
3355 $TICK_WATCHER->start;
3356 $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
3447 }
3448
3357 EV::loop; 3449 EV::loop;
3358} 3450}
3359 3451
3360############################################################################# 3452#############################################################################
3361# initialisation and cleanup 3453# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3369 }; 3461 };
3370 } 3462 }
3371} 3463}
3372 3464
3373sub write_runtime { 3465sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3375 3467
3376 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3378 3470
… …
3404 and return; 3496 and return;
3405 3497
3406 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3407 3499
3408 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3409} 3544}
3410 3545
3411sub emergency_save() { 3546sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3413 3548
… …
3435 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3436 3571
3437 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3440 }; 3579 };
3441 3580
3442 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3443} 3582}
3444 3583
… …
3459 warn "reloading..."; 3598 warn "reloading...";
3460 3599
3461 warn "entering sync_job"; 3600 warn "entering sync_job";
3462 3601
3463 cf::sync_job { 3602 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3604 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3467 3606
3468 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3609
3471 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
… …
3558 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3559 3698
3560 1 3699 1
3561 } or do { 3700 } or do {
3562 warn $@; 3701 warn $@;
3563 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3703 };
3566 3704
3567 warn "reloaded"; 3705 warn "reloaded";
3568}; 3706};
3569 3707
… …
3597 3735
3598our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3600 3738
3601sub wait_for_tick { 3739sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3741
3605 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3744 $signal->wait;
3608} 3745}
3609 3746
3610sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3749
3614 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3752 $signal->wait;
3617} 3753}
3618 3754
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3755sub tick {
3620 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3623 return; 3759 return;
3624 } 3760 }
3625 3761
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3763
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3766 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3768 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3770 };
3640 } 3771 }
3641 3772
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3775 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3777 $sig->send;
3647 } 3778 }
3648 3779
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3782
3652 _post_tick; 3783 if (0) {
3653}; 3784 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3789 }
3790}
3655 3791
3656{ 3792{
3657 # configure BDB 3793 # configure BDB
3658 3794
3659 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3662 3798
3663 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | 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;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3806
3670 cf::sync_job { 3807 cf::sync_job {
3671 eval { 3808 eval {
… …
3697{ 3834{
3698 # configure IO::AIO 3835 # configure IO::AIO
3699 3836
3700 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3839 undef $AnyEvent::AIO::WATCHER;
3703} 3840}
3704 3841
3705my $_log_backtrace; 3842my $_log_backtrace;
3706 3843
3707sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

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