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.570 by root, Wed May 4 07:41:14 2011 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
108our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 117
113our %RESOURCE; # unused 118#our %RESOURCE; # unused
114 119
115our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
117 122
118our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
129our $DB_ENV; 134our $DB_ENV;
130 135
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 137
133our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 140
135our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
137our $NOW; 144our $NOW;
138 145
139our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
150 157
151our @POST_INIT; 158our @POST_INIT;
152 159
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
155 165
156binmode STDOUT; 166binmode STDOUT;
157binmode STDERR; 167binmode STDERR;
158 168
159# read virtual server time, if available 169# read virtual server time, if available
193 203
194=over 4 204=over 4
195 205
196=item $cf::UPTIME 206=item $cf::UPTIME
197 207
198The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
199 224
200=item $cf::RUNTIME 225=item $cf::RUNTIME
201 226
202The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 228every server tick.
204 229
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 233
209Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
212database environment. 237database environment.
213 238
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 239=item $cf::LOADAVG
223 240
224The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
234Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235from wherever your confdir points to. 252from wherever your confdir points to.
236 253
237=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
238 255
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
240returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
242 272
243=cut 273=cut
244 274
245sub wait_for_tick(); 275sub wait_for_tick();
246sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
312)) { 342)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 344}
315 345
316$EV::DIED = sub { 346$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
318}; 348};
319 349
320############################################################################# 350#############################################################################
321 351
322sub fork_call(&@); 352sub fork_call(&@);
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 380 $d
351 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
352} 382}
353 383
354=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
355 385
356Loads the given file from path and returns its contents. Croaks on error 386Loads the given file from path and returns its contents. Croaks on error
357and can block. 387and can block.
358 388
359=cut 389=cut
361sub load_file($) { 391sub load_file($) {
362 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
364 394
365 $data 395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
366} 434}
367 435
368=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
369 437
370Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
545 } 613 }
546 } 614 }
547 615
548 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 619 } else {
553 $busy = 0; 620 $busy = 0;
554 Coro::schedule; 621 Coro::schedule;
555 } 622 }
556 } 623 }
834 901
835 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
836 } 903 }
837 } 904 }
838 905
839 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
840 my $data = $process->(\@data); 907 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
842 909
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844 911
845 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
1366=cut 1433=cut
1367 1434
1368############################################################################# 1435#############################################################################
1369# command handling &c 1436# command handling &c
1370 1437
1371=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1372 1439
1373Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1374$name. 1441$name.
1375 1442
1376=cut 1443=cut
1382 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1383 1450
1384 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1385} 1452}
1386 1453
1387=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1388 1455
1389Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully. 1460has logged in successfully.
1394 1461
1395If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1396called.
1397 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1398=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1399 1470
1400Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1402are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1403is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1404log-in. 1475log-in.
1405 1476
1406If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1407called.
1408 1478
1409=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1411sub register_extcmd { 1486sub register_extcmd($$) {
1412 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1413 1488
1414 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1415} 1490}
1416 1491
1417sub register_exticmd { 1492sub register_async_extcmd($$) {
1418 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1419 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1420 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1421} 1508}
1422 1509
1423use File::Glob (); 1510use File::Glob ();
1424 1511
1425cf::player->attach ( 1512cf::player->attach (
1439 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1440 1527
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1529
1443 if (ref $msg) { 1530 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1532
1449 my @reply;
1450
1451 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1453 } 1551 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457 1552
1458 } else { 1553 } else {
1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460 } 1555 }
1461 1556
1474 }; 1569 };
1475 1570
1476 $grp 1571 $grp
1477} 1572}
1478 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1479sub load_extensions { 1585sub load_extensions {
1480 info "loading extensions..."; 1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1481 1589
1482 cf::sync_job { 1590 cf::sync_job {
1483 my %todo; 1591 my %todo;
1484 1592
1485 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1528 unless exists $done{$_}; 1636 unless exists $done{$_};
1529 } 1637 }
1530 1638
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1640
1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1533 my $active = eval $v->{source}; 1650 my $active = eval $source;
1534 1651
1535 if (length $@) { 1652 if (length $@) {
1536 error "$v->{path}: $@\n"; 1653 error "$v->{path}: $@\n";
1537 1654
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1825} 1942}
1826 1943
1827=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828 1945
1829Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1830
1831=item $player->ext_reply ($msgid, @msg)
1832
1833Sends an ext reply to the player.
1834
1835=cut
1836
1837sub ext_reply($$@) {
1838 my ($self, $id, @msg) = @_;
1839
1840 $self->ns->ext_reply ($id, @msg)
1841}
1842 1947
1843=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1844 1949
1845Sends an ext event to the client. 1950Sends an ext event to the client.
1846 1951
2245# if $self->per_party; 2350# if $self->per_party;
2246 2351
2247 $self 2352 $self
2248} 2353}
2249 2354
2250# find and load all maps in the 3x3 area around a map
2251sub load_neighbours {
2252 my ($map) = @_;
2253
2254 my @neigh; # diagonal neighbours
2255
2256 for (0 .. 3) {
2257 my $neigh = $map->tile_path ($_)
2258 or next;
2259 $neigh = find $neigh, $map
2260 or next;
2261 $neigh->load;
2262
2263 # now find the diagonal neighbours
2264 push @neigh,
2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2267 }
2268
2269 for (grep defined $_->[0], @neigh) {
2270 my ($path, $origin) = @$_;
2271 my $neigh = find $path, $origin
2272 or next;
2273 $neigh->load;
2274 }
2275}
2276
2277sub find_sync { 2355sub find_sync {
2278 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2279 2357
2280 # it's a bug to call this from the main context 2358 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2299 2377
2300sub find_async { 2378sub find_async {
2301 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2302 2380
2303 $path = normalise $path, $origin; 2381 $path = normalise $path, $origin;
2304 2382
2305 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2306 return $map if !$load || $map->linkable; 2384 return $map if !$load || $map->linkable;
2307 } 2385 }
2308 2386
2309 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2753 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2754 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2755 if $x <= 0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2756 2834
2757 $map->load; 2835 $map->load;
2758 $map->load_neighbours;
2759 2836
2760 return unless $self->contr->active; 2837 return unless $self->contr->active;
2761 2838
2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763 if ($self->enter_map ($map, $x, $y)) { 2840 if ($self->enter_map ($map, $x, $y)) {
3179=cut 3256=cut
3180 3257
3181sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3183 3260
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
3187 push @msg, msgtype => "event_$type";
3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3262}
3209 3263
3210=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3211 3265
3212Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3267 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3268 3322
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3324
3271 if (ref $msg) { 3325 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3327
3277 my @reply;
3278
3279 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3281 } 3346 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else { 3347 } else {
3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288 } 3349 }
3289 3350
3290 cf::override; 3351 cf::override;
3458=cut 3519=cut
3459 3520
3460############################################################################# 3521#############################################################################
3461# the server's init and main functions 3522# the server's init and main functions
3462 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525our @FACEDATA; # dynamically-created facedata
3526
3527# internal api, not fianlised
3528sub set_face {
3529 my ($name, $type, $data) = @_;
3530
3531 my $idx = cf::face::find $name;
3532
3533 if ($idx) {
3534 delete $FACEHASH{cf::face::get_chksum $idx};
3535 } else {
3536 $idx = cf::face::alloc $name;
3537 }
3538
3539 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3540
3541 cf::face::set_type $idx, $type;
3542 cf::face::set_data $idx, 0, (length $data), 0, $hash;
3543 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3544
3545 # we need to destroy the SV itself, not just overwrite,
3546 # as a running ix might hold a reference to it.
3547 # delete achieves that.
3548 delete $FACEDATA[$idx];
3549 $FACEDATA[$idx] = $data;
3550 $FACEHASH{$hash} = $idx;#d#
3551
3552 $idx
3553}
3554
3555our $FACEDATA; # facedata filehandle
3556
3557sub _face_get_data($$$$) {
3558 my ($idx, $size, $fofs, $cb) = @_;
3559
3560 if (defined $FACEDATA[$idx]) {
3561 $cb->($FACEDATA[$idx]);
3562 } elsif ($fofs) {
3563 my $buf;
3564 IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
3565 if ($_[0] == $size) {
3566 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3567 $cb->($buf);
3568 } else {
3569 cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
3570 }
3571 };
3572 } else {
3573 cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
3574 }
3575}
3576
3577# rather ineffient
3578sub cf::face::get_data($;$) {
3579 my ($idx, $faceset) = @_;
3580
3581 my $size = cf::face::get_size $idx, $faceset;
3582 my $fofs = cf::face::get_fofs $idx, $faceset;
3583
3584 _face_get_data $idx, $size, $fofs, Coro::rouse_cb;
3585 Coro::rouse_wait
3586}
3587
3588sub cf::face::ix {
3589 my ($ns, $idx, $pri, $size, $fofs) = @_;
3590
3591 _face_get_data $idx, $size, $fofs, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594}
3595
3463sub load_facedata($) { 3596sub load_facedata($) {
3464 my ($path) = @_; 3597 my ($path) = @_;
3465 3598
3466 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?)
3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3599 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471 3600
3472 trace "loading facedata from $path\n"; 3601 trace "loading facedata from $path\n";
3473 3602
3474 my $facedata = decode_storable load_file $path; 3603 my $facedata = decode_storable load_file "$path/faceinfo";
3475 3604
3476 $facedata->{version} == 2 3605 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3478 3607
3479 # patch in the exptable 3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3609 or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3481 $facedata->{resource}{"res/exp_table"} = { 3610
3482 type => FT_RSRC, 3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3483 data => $exp_table, 3612
3484 hash => (Digest::MD5::md5 $exp_table), 3613 # BEGIN ATOMIC
3485 }; 3614 # from here on, everything must be atomic - no thread switch allowed
3486 cf::cede_to_tick; 3615 my $t1 = EV::time;
3487 3616
3488 { 3617 {
3489 my $faces = $facedata->{faceinfo}; 3618 my $faces = $facedata->{faceinfo};
3490 3619
3491 while (my ($face, $info) = each %$faces) { 3620 for my $face (sort keys %$faces) {
3621 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3622 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3623
3494 cf::face::set_visibility $idx, $info->{visibility}; 3624 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3625 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3627 cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3628 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3499 3629 $FACEHASH{$info->{hash64}} = $idx;#d#
3500 cf::cede_to_tick;
3501 } 3630 }
3502 3631
3503 while (my ($face, $info) = each %$faces) { 3632 while (my ($face, $info) = each %$faces) {
3504 next unless $info->{smooth}; 3633 next unless $info->{smooth};
3505 3634
3510 cf::face::set_smooth $idx, $smooth; 3639 cf::face::set_smooth $idx, $smooth;
3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3640 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3512 } else { 3641 } else {
3513 error "smooth face '$info->{smooth}' not found for face '$face'"; 3642 error "smooth face '$info->{smooth}' not found for face '$face'";
3514 } 3643 }
3515
3516 cf::cede_to_tick;
3517 } 3644 }
3518 } 3645 }
3519 3646
3520 { 3647 {
3521 my $anims = $facedata->{animinfo}; 3648 my $anims = $facedata->{animinfo};
3522 3649
3523 while (my ($anim, $info) = each %$anims) { 3650 while (my ($anim, $info) = each %$anims) {
3524 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3651 cf::anim::set $anim, $info->{frames}, $info->{facings};
3525 cf::cede_to_tick;
3526 } 3652 }
3527 3653
3528 cf::anim::invalidate_all; # d'oh 3654 cf::anim::invalidate_all; # d'oh
3529 } 3655 }
3530 3656
3531 { 3657 {
3532 my $res = $facedata->{resource}; 3658 my $res = $facedata->{resource};
3533 3659
3534 while (my ($name, $info) = each %$res) { 3660 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3661 if (defined (my $type = $info->{type})) {
3662 # TODO: different hash - must free and use new index, or cache ixface data queue
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3663 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3664
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3665 cf::face::set_type $idx, $type;
3666 cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
3667 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3668 $FACEHASH{$info->{hash}} = $idx;#d#
3540 } else { 3669 } else {
3541 $RESOURCE{$name} = $info; # unused 3670# $RESOURCE{$name} = $info; # unused
3542 } 3671 }
3543
3544 cf::cede_to_tick;
3545 } 3672 }
3546 } 3673 }
3674
3675 ($fh, $FACEDATA) = ($FACEDATA, $fh);
3676
3677 # HACK to clear player env face cache, we need some signal framework
3678 # for this (global event?)
3679 %ext::player_env::MUSIC_FACE_CACHE = ();
3680
3681 # END ATOMIC
3682
3683 cf::debug "facedata atomic update time ", EV::time - $t1;
3547 3684
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3685 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3686
3687 aio_close $fh if $fh; # close old facedata
3549 3688
3550 1 3689 1
3551} 3690}
3552 3691
3553register_exticmd fx_want => sub { 3692register_exticmd fx_want => sub {
3564 my $status = load_resource_file_ $_[0]; 3703 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3704 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3705 cf::arch::commit_load;
3567 3706
3568 $status 3707 $status
3708}
3709
3710sub reload_exp_table {
3711 _reload_exp_table;
3712
3713 set_face "res/exp_table" => FT_RSRC,
3714 JSON::XS->new->utf8->canonical->encode (
3715 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3716 );
3717}
3718
3719sub reload_materials {
3720 _reload_materials;
3569} 3721}
3570 3722
3571sub reload_regions { 3723sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework 3724 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?) 3725 # for this (global event?)
3581 if exists $_->{match}; 3733 if exists $_->{match};
3582 } 3734 }
3583} 3735}
3584 3736
3585sub reload_facedata { 3737sub reload_facedata {
3586 load_facedata "$DATADIR/facedata" 3738 load_facedata $DATADIR
3587 or die "unable to load facedata\n"; 3739 or die "unable to load facedata\n";
3588} 3740}
3589 3741
3590sub reload_archetypes { 3742sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3743 load_resource_file "$DATADIR/archetypes"
3592 or die "unable to load archetypes\n"; 3744 or die "unable to load archetypes\n";
3745
3746 set_face "res/skill_info" => FT_RSRC,
3747 JSON::XS->new->utf8->canonical->encode (
3748 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3749 );
3750 set_face "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3593} 3754}
3594 3755
3595sub reload_treasures { 3756sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
3618} 3779}
3619 3780
3620sub reload_resources { 3781sub reload_resources {
3621 trace "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3622 3783
3623 reload_exp_table;
3624 reload_materials; 3784 reload_materials;
3625 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3626 reload_sound; 3787 reload_sound;
3627 reload_archetypes; 3788 reload_archetypes;
3628 reload_regions; 3789 reload_regions;
3629 reload_treasures; 3790 reload_treasures;
3630 3791
3682 3843
3683sub main { 3844sub main {
3684 cf::init_globals; # initialise logging 3845 cf::init_globals; # initialise logging
3685 3846
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3847 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3848 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3849 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3851
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3853
3693 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3857 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
3702 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3703 3864
3704 cf::sync_job { 3865 cf::sync_job {
3705 cf::incloader::init (); 3866 cf::incloader::init ();
3706 3867
3868 db_init;
3869
3707 cf::init_anim; 3870 cf::init_anim;
3708 cf::init_attackmess; 3871 cf::init_attackmess;
3709 cf::init_dynamic; 3872 cf::init_dynamic;
3710 3873
3711 cf::load_settings; 3874 cf::load_settings;
3712 3875
3713 reload_resources; 3876 reload_resources;
3714 reload_config; 3877 reload_config;
3715 db_init;
3716 3878
3717 cf::init_uuid; 3879 cf::init_uuid;
3718 cf::init_signals; 3880 cf::init_signals;
3719 cf::init_skills; 3881 cf::init_skills;
3720 3882
3734 }; 3896 };
3735 3897
3736 cf::object::thawer::errors_are_fatal 0; 3898 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3899 info "parse errors in files are no longer fatal from this point on.\n";
3738 3900
3739 my $free_main; $free_main = EV::idle sub { 3901 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3902 undef &main; # free gobs of memory :)
3742 }; 3903 };
3743 3904
3744 goto &main_loop; 3905 goto &main_loop;
3745} 3906}
3902 4063
3903 cf::write_runtime_sync; # external watchdog should not bark 4064 cf::write_runtime_sync; # external watchdog should not bark
3904 4065
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4066 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4067 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4068 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 4069 }
3909 4070
3910 cf::write_runtime_sync; # external watchdog should not bark 4071 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4072 };
3912 4073
4093 4254
4094############################################################################# 4255#############################################################################
4095 4256
4096my $bug_warning = 0; 4257my $bug_warning = 0;
4097 4258
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4259sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4260 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4261
4104 my $signal = new Coro::Signal; 4262 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4263}
4108 4264
4109sub wait_for_tick_begin() { 4265sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4266 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4267
4112 my $signal = new Coro::Signal; 4268 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4269 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4270 $signal->wait;
4115} 4271}
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4275 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4276 unless ++$bug_warning > 10;
4121 return; 4277 return;
4122 } 4278 }
4123 4279
4124 cf::server_tick; # one server iteration 4280 cf::one_tick; # one server iteration
4125 4281
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4282 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4283
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4284 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4285 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4135 } 4291 }
4136 4292
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4293 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4294 $sig->send;
4139 } 4295 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4296 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4297
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4298 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4299 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4300
4147 if (0) { 4301 if (0) {
4153 } 4307 }
4154} 4308}
4155 4309
4156{ 4310{
4157 # configure BDB 4311 # configure BDB
4312 info "initialising database";
4158 4313
4159 BDB::min_parallel 16; 4314 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4317
4163 unless ($DB_ENV) { 4318 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4319 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4320 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4321 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4347 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4350 };
4351
4352 info "database initialised";
4196} 4353}
4197 4354
4198{ 4355{
4199 # configure IO::AIO 4356 # configure IO::AIO
4200 4357
4358 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
4204} 4363}
4205 4364
4206our $_log_backtrace; 4365our $_log_backtrace;
4207our $_log_backtrace_last; 4366our $_log_backtrace_last;
4208 4367

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines