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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.437 by root, Tue Jul 8 08:33:27 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
… …
192 LOG llevError, $msg; 214 LOG llevError, $msg;
193 }; 215 };
194} 216}
195 217
196$Coro::State::DIEHOOK = sub { 218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
197 warn Carp::longmess $_[0]; 227 warn Carp::longmess $_[0];
198 Coro::terminate; 228 Coro::terminate
199}; 229};
230
231$SIG{__DIE__} = sub { }; #d#?
200 232
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
329 361
330 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
331} 363}
332 364
333sub freeze_mainloop { 365sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
335 367
336 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 369}
342 370
343=item cf::periodic $interval, $cb 371=item cf::periodic $interval, $cb
344 372
345Like 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
… …
400 } 428 }
401 } 429 }
402}; 430};
403 431
404sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
405 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
406 436
407 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
409 439
… …
446 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
448 478
449 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
450 480
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
454 482
455 my $busy = 1; 483 my $busy = 1;
456 my @res; 484 my @res;
457 485
… …
468 } else { 496 } else {
469 EV::loop EV::LOOP_ONESHOT; 497 EV::loop EV::LOOP_ONESHOT;
470 } 498 }
471 } 499 }
472 500
473 $time = EV::time - $time; 501 my $time = EV::time - $time;
474 502
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
479 504
480 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
481 } else { 506 } else {
482 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
483 508
… …
525 reset_signals; 550 reset_signals;
526 &$cb 551 &$cb
527 }, @args; 552 }, @args;
528 553
529 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
530} 582}
531 583
532=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
533 585
534Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
1090 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1093 1145
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1150 aio_close $fh;
1099 1151
1100 if (@$objs) { 1152 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1158 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1160 }
1109 } else { 1161 } else {
1110 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1111 } 1163 }
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1308 1360
1309 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1362 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1364 }
1314 1365
1315 warn $msg; 1366 warn $msg;
1316 } 1367 }
1317 1368
… …
1406 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1458 or return;
1408 1459
1409 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1410 or return; 1461 or return;
1462
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1414 } 1466 }
1415 } 1467 }
… …
1425 1477
1426 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1427 1479
1428 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1430 1484
1431 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1486 cf::cede_to_tick;
1433} 1487}
1434 1488
… …
1470 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1471 $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
1472 1526
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1477 1533
1478 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1518 1574
1519 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1520 my $path = path $login; 1576 my $path = path $login;
1521 1577
1522 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1584 }
1528 1585
… …
1727our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1729 1786
1730sub generate_random_map { 1787sub generate_random_map {
1731 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
1732 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1793 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1918
1859# the temporary/swap location 1919# the temporary/swap location
1860sub save_path { 1920sub save_path {
1861 my ($self) = @_; 1921 my ($self) = @_;
1862 1922
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1865} 1925}
1866 1926
1867# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1868sub uniq_path { 1928sub uniq_path {
1869 my ($self) = @_; 1929 my ($self) = @_;
1870 1930
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1873} 1933}
1874 1934
1875# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1876# all maps in C++... 1936# all maps in C++...
… …
1974 2034
1975 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1977 2037
1978 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 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";
1981 2041
1982 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1983 or return; 2043 or return;
1984 2044
1985 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 2048 or return;
1989 2049
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1993 undef $guard1; 2054 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2055 $map->reset;
1996 return find $path; 2056 return find $path;
1997 } 2057 }
1998 2058
1999 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2062 } 2122 }
2063 2123
2064 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2066 2126
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2128 }
2069 2129
2070 $self->post_load; 2130 $self->post_load;
2071} 2131}
2072 2132
… …
2130 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2131 2191
2132 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2133 2193
2134 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2196 }
2137 2197
2138 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2139 2199
2140 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2237 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2180 }; 2240 };
2181 2241
2242 cf::get_slot 0.02;
2243
2182 if ($uniq) { 2244 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2247 } else {
2186 $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);
… …
2194 $self->save; 2256 $self->save;
2195 2257
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2259
2198 return if $self->players; 2260 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2201 2263
2202 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2203 2265
2204 $self->deactivate; 2266 $self->deactivate;
… …
2322 2384
2323sub unique_maps() { 2385sub unique_maps() {
2324 [ 2386 [
2325 map { 2387 map {
2326 utf8::decode $_; 2388 utf8::decode $_;
2327 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2328 ? normalise $_ 2392 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2394 ]
2332} 2395}
2333 2396
2334package cf;
2335
2336=back 2397=back
2337 2398
2338=head3 cf::object 2399=head3 cf::object
2339 2400
2340=cut 2401=cut
… …
2343 2404
2344=over 4 2405=over 4
2345 2406
2346=item $ob->inv_recursive 2407=item $ob->inv_recursive
2347 2408
2348Returns 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.
2349 2411
2350=cut 2412=cut
2351 2413
2352sub inv_recursive_; 2414sub inv_recursive_;
2353sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2359} 2421}
2360 2422
2361=item $ref = $ob->ref 2423=item $ref = $ob->ref
2362 2424
2363creates 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.
2364 2426
2365=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2366 2428
2367returns 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,
2368even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2400can 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
2401dialogue with the given NPC character. 2463dialogue with the given NPC character.
2402 2464
2403=cut 2465=cut
2404 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
2405# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2482# with dialog boxes.
2407#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
2408sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2421 $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));
2422 2498
2423 } else { 2499 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2502 }
2427 } 2503 }
2428} 2504}
2429 2505
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2541be 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 >>.
2542 2621
2543=cut 2622=cut
2544 2623
2545our $GOTOGEN; 2624our $GOTOGEN;
2546 2625
… …
2625} 2704}
2626 2705
2627sub prepare_random_map { 2706sub prepare_random_map {
2628 my ($exit) = @_; 2707 my ($exit) = @_;
2629 2708
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2711 # that depends on the exit object
2635 2712
2636 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2715 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2643 } 2722 }
2644 2723
2645 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2646 2725
2647 my $data = cf::encode_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2650 2729
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2732 undef $fh;
2654 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2655 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2658 } 2741 }
2659} 2742}
2660 2743
2661sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2663 2746
2664 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2665 2748
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2749 $self->enter_link;
2678 2750
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2751 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2685 2753
2686 $self->deactivate_recursive; # just to be sure
2687 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
2688 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2689 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
2690 1; 2775 1
2691 }) { 2776 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "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. "
2694 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2860 id => "infobox",
2776 title => "Map Info", 2861 title => "Map Info",
2777 reply => undef, 2862 reply => undef,
2778 tooltip => "Information related to the maps", 2863 tooltip => "Information related to the maps",
2779 }, 2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2780); 2871);
2781 2872
2782sub cf::client::send_msg { 2873sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2875
… …
3021 3112
3022The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
3023 3114
3024 cf::object 3115 cf::object
3025 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
3026 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
3027 3118
3028 cf::object::player 3119 cf::object::player
3029 player 3120 player
3030 3121
3031 cf::player 3122 cf::player
… …
3036 3127
3037=cut 3128=cut
3038 3129
3039for ( 3130for (
3040 ["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
3041 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3133 decrease split destroy)],
3043 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3046) { 3137) {
3047 no strict 'refs'; 3138 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3257 } 3348 }
3258}; 3349};
3259 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
3260sub reload_regions { 3361sub reload_regions {
3261 # 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
3262 # for this (global event?) 3363 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3365
… …
3277} 3378}
3278 3379
3279sub reload_archetypes { 3380sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3383}
3288 3384
3289sub reload_treasures { 3385sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3292} 3388}
3293 3389
3294sub reload_resources { 3390sub reload_resources {
3295 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3296 3392
3393 reload_facedata;
3394 reload_archetypes;
3297 reload_regions; 3395 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3396 reload_treasures;
3302 3397
3303 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3304} 3399}
3305 3400
3306sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3307 reload_resources; 3406 reload_resources;
3308} 3407}
3309 3408
3310sub reload_config { 3409sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3339 }; 3438 };
3340 3439
3440 {
3441 my $guard = freeze_mainloop;
3341 reload_config; 3442 reload_config;
3342 db_init; 3443 db_init;
3343 load_extensions; 3444 load_extensions;
3344 3445
3345 $TICK_WATCHER->start;
3346 $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
3347 EV::loop; 3449 EV::loop;
3348} 3450}
3349 3451
3350############################################################################# 3452#############################################################################
3351# initialisation and cleanup 3453# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3359 }; 3461 };
3360 } 3462 }
3361} 3463}
3362 3464
3363sub write_runtime { 3465sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3365 3467
3366 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3368 3470
… …
3394 and return; 3496 and return;
3395 3497
3396 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3397 3499
3398 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 };
3399} 3544}
3400 3545
3401sub emergency_save() { 3546sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3403 3548
… …
3425 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3426 3571
3427 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3429 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";
3430 }; 3579 };
3431 3580
3432 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3433} 3582}
3434 3583
… …
3449 warn "reloading..."; 3598 warn "reloading...";
3450 3599
3451 warn "entering sync_job"; 3600 warn "entering sync_job";
3452 3601
3453 cf::sync_job { 3602 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3604 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3457 3606
3458 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3609
3461 # 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
… …
3548 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3549 3698
3550 1 3699 1
3551 } or do { 3700 } or do {
3552 warn $@; 3701 warn $@;
3553 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3703 };
3556 3704
3557 warn "reloaded"; 3705 warn "reloaded";
3558}; 3706};
3559 3707
… …
3562sub reload_perl() { 3710sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3565 3713
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3715 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3717 };
3570} 3718}
3571 3719
3572register_command "reload" => sub { 3720register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
… …
3587 3735
3588our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3590 3738
3591sub wait_for_tick { 3739sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3741
3595 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3744 $signal->wait;
3598} 3745}
3599 3746
3600sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3749
3604 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3752 $signal->wait;
3607} 3753}
3608 3754
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3755sub tick {
3610 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3611 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"
3612 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3613 return; 3759 return;
3614 } 3760 }
3615 3761
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3763
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $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.;
3625 Coro::async_pool { 3766 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3768 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3770 };
3630 } 3771 }
3631 3772
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3775 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3777 $sig->send;
3637 } 3778 }
3638 3779
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3782
3642 _post_tick; 3783 if (0) {
3643}; 3784 if ($NEXT_TICK) {
3644$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}
3645 3791
3646{ 3792{
3647 # configure BDB 3793 # configure BDB
3648 3794
3649 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3652 3798
3653 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3806
3660 cf::sync_job { 3807 cf::sync_job {
3661 eval { 3808 eval {
… …
3687{ 3834{
3688 # configure IO::AIO 3835 # configure IO::AIO
3689 3836
3690 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3839 undef $AnyEvent::AIO::WATCHER;
3693} 3840}
3694 3841
3695my $_log_backtrace; 3842my $_log_backtrace;
3696 3843
3697sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

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