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.574 by root, Sun May 8 21:51:27 2011 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 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 = 0; 142our $RUNTIME = 0;
137our $SERVER_TICK = 0; 143our $SERVER_TICK = 0;
138our $NOW; 144our $NOW;
219=item $cf::RUNTIME 225=item $cf::RUNTIME
220 226
221The 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
222every server tick. 228every server tick.
223 229
224=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227 233
228Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
229directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
231database environment. 237database environment.
245Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246from wherever your confdir points to. 252from wherever your confdir points to.
247 253
248=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
249 255
250These 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.
251returns 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
252per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
253 260
254Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
258 265
259=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
335)) { 342)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 344}
338 345
339$EV::DIED = sub { 346$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
341}; 348};
342 349
343############################################################################# 350#############################################################################
344 351
345sub fork_call(&@); 352sub fork_call(&@);
372 $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;
373 $d 380 $d
374 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
375} 382}
376 383
377=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
378 385
379Loads 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
380and can block. 387and can block.
381 388
382=cut 389=cut
384sub load_file($) { 391sub load_file($) {
385 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
387 394
388 $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
389} 434}
390 435
391=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
392 437
393Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
528Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
530C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede. 576till the next cede.
532 577
533Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
534should use 100 or more. 579should use 100 or more.
535 580
536The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
537used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
538 583
551 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
552 my $busy; 597 my $busy;
553 598
554 while () { 599 while () {
555 next_job: 600 next_job:
601
602 Coro::cede;
556 603
557 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
558 605
559 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0; 608 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send; 610 $job->[2]->send;
564 Coro::cede;
565 goto next_job; 611 goto next_job;
566 } else { 612 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 } 614 }
569 } 615 }
570 616
571 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
573 $WAIT_FOR_TICK->wait;
574 } else { 619 } else {
575 $busy = 0; 620 $busy = 0;
576 Coro::schedule; 621 Coro::schedule;
577 } 622 }
578 } 623 }
693 reset_signals; 738 reset_signals;
694} 739}
695 740
696sub fork_call(&@) { 741sub fork_call(&@) {
697 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
698
699 # we seemingly have to make a local copy of the whole thing,
700 # otherwise perl prematurely frees the stuff :/
701 # TODO: investigate and fix (likely this will be rather laborious)
702 743
703 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
704 cf::post_fork; 745 cf::post_fork;
705 &$cb 746 &$cb
706 } @args; 747 } @args;
856 897
857 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
858 } 899 }
859 } 900 }
860 901
861 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
862 my $data = $process->(\@data); 903 my $data = $process->(\@data);
863 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
864 905
865 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866 907
867 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
868 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1388=cut 1429=cut
1389 1430
1390############################################################################# 1431#############################################################################
1391# command handling &c 1432# command handling &c
1392 1433
1393=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1394 1435
1395Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1396$name. 1437$name.
1397 1438
1398=cut 1439=cut
1404 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1405 1446
1406 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1407} 1448}
1408 1449
1409=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1410 1451
1411Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1414the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1415has logged in successfully. 1456has logged in successfully.
1416 1457
1417If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1418called.
1419 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1420=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1421 1466
1422Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1423exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1424are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1425is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1426log-in. 1471log-in.
1427 1472
1428If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1429called.
1430 1474
1431=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1433sub register_extcmd { 1482sub register_extcmd($$) {
1434 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1435 1484
1436 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1437} 1486}
1438 1487
1439sub register_exticmd { 1488sub register_async_extcmd($$) {
1440 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1441 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1442 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1443} 1504}
1444 1505
1445use File::Glob (); 1506use File::Glob ();
1446 1507
1447cf::player->attach ( 1508cf::player->attach (
1461 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1462 1523
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1525
1465 if (ref $msg) { 1526 if (ref $msg) {
1466 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470 1528
1471 my @reply;
1472
1473 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1474 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1475 } 1547 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479 1548
1480 } else { 1549 } else {
1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482 } 1551 }
1483 1552
1496 }; 1565 };
1497 1566
1498 $grp 1567 $grp
1499} 1568}
1500 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1501sub load_extensions { 1581sub load_extensions {
1502 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1503 1585
1504 cf::sync_job { 1586 cf::sync_job {
1505 my %todo; 1587 my %todo;
1506 1588
1507 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1550 unless exists $done{$_}; 1632 unless exists $done{$_};
1551 } 1633 }
1552 1634
1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1555 my $active = eval $v->{source}; 1646 my $active = eval $source;
1556 1647
1557 if (length $@) { 1648 if (length $@) {
1558 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1559 1650
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1847} 1938}
1848 1939
1849=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850 1941
1851Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1852
1853=item $player->ext_reply ($msgid, @msg)
1854
1855Sends an ext reply to the player.
1856
1857=cut
1858
1859sub ext_reply($$@) {
1860 my ($self, $id, @msg) = @_;
1861
1862 $self->ns->ext_reply ($id, @msg)
1863}
1864 1943
1865=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1866 1945
1867Sends an ext event to the client. 1946Sends an ext event to the client.
1868 1947
2571 2650
2572Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2573 2652
2574=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2575 2654
2576returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2577even if the object actually exists. May block. 2656even if the object actually exists. May block.
2578 2657
2579=cut 2658=cut
2580 2659
2581sub deref { 2660sub deref {
2963 3042
2964=head3 cf::client 3043=head3 cf::client
2965 3044
2966=over 4 3045=over 4
2967 3046
2968=item $client->send_drawinfo ($text, $flags)
2969
2970Sends a drawinfo packet to the client. Circumvents output buffering so
2971should not be used under normal circumstances.
2972
2973=cut
2974
2975sub cf::client::send_drawinfo {
2976 my ($self, $text, $flags) = @_;
2977
2978 utf8::encode $text;
2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
2983 3048
2984Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required. 3050them as required.
2986 3051
3004 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3005} 3070}
3006 3071
3007=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3008 3073
3009Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
3010client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3011the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
3012the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3013 3078
3014=cut 3079=cut
3015 3080
3016# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
3121 id => "death", 3186 id => "death",
3122 title => "Death", 3187 title => "Death",
3123 reply => undef, 3188 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3125 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3126 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3128); 3199);
3129 3200
3130sub cf::client::send_msg { 3201sub cf::client::send_msg {
3173=cut 3244=cut
3174 3245
3175sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3176 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3177 3248
3178 if ($self->extcmd == 2) {
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3180 } elsif ($self->extcmd == 1) { # TODO: remove
3181 push @msg, msgtype => "event_$type";
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184}
3185
3186=item $client->ext_reply ($msgid, @msg)
3187
3188Sends an ext reply to the client.
3189
3190=cut
3191
3192sub cf::client::ext_reply($$@) {
3193 my ($self, $id, @msg) = @_;
3194
3195 if ($self->extcmd == 2) {
3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3197 } elsif ($self->extcmd == 1) {
3198 #TODO: version 1, remove
3199 unshift @msg, msgtype => "reply", msgid => $id;
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3201 }
3202} 3250}
3203 3251
3204=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3205 3253
3206Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
3226 3274
3227 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3228 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3229 3277
3230 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
3231} 3317}
3232 3318
3233cf::client->attach ( 3319cf::client->attach (
3234 on_connect => sub { 3320 on_connect => sub {
3235 my ($ns) = @_; 3321 my ($ns) = @_;
3261 my ($ns, $buf) = @_; 3347 my ($ns, $buf) = @_;
3262 3348
3263 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3349 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3264 3350
3265 if (ref $msg) { 3351 if (ref $msg) {
3266 my ($type, $reply, @payload) = 3352 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3267 "ARRAY" eq ref $msg
3268 ? @$msg
3269 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3270 3353
3271 my @reply;
3272
3273 if (my $cb = $EXTICMD{$type}) { 3354 if (my $cb = $EXTIACMD{$type}) {
3355 $cb->(
3356 $ns,
3357 sub {
3358 $ns->ext_msg ("reply-$reply", @_)
3359 if $reply;
3360 },
3361 @payload
3362 );
3363 } else {
3364 my @reply;
3365
3366 if (my $cb = $EXTICMD{$type}) {
3274 @reply = $cb->($ns, @payload); 3367 @reply = $cb->($ns, @payload);
3368 }
3369
3370 $ns->ext_msg ("reply-$reply", @reply)
3371 if $reply;
3275 } 3372 }
3276
3277 $ns->ext_reply ($reply, @reply)
3278 if $reply;
3279
3280 } else { 3373 } else {
3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3374 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3282 } 3375 }
3283 3376
3284 cf::override; 3377 cf::override;
3452=cut 3545=cut
3453 3546
3454############################################################################# 3547#############################################################################
3455# the server's init and main functions 3548# the server's init and main functions
3456 3549
3550{
3551 package cf::face;
3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3560 # internal api, not finalised
3561 sub set {
3562 my ($name, $type, $data) = @_;
3563
3564 my $idx = cf::face::find $name;
3565
3566 if ($idx) {
3567 delete $HASH{cf::face::get_csum $idx};
3568 } else {
3569 $idx = cf::face::alloc $name;
3570 }
3571
3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3573
3574 cf::face::set_type $idx, $type;
3575 cf::face::set_csum $idx, 0, $hash;
3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3584 $HASH{$hash} = $idx;#d#
3585
3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3625}
3626
3457sub load_facedata($) { 3627sub load_facedata($) {
3458 my ($path) = @_; 3628 my ($path) = @_;
3459 3629
3460 # HACK to clear player env face cache, we need some signal framework
3461 # for this (global event?)
3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3463
3464 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465 3631
3466 trace "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3467 3633
3468 my $facedata = decode_storable load_file $path; 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3469 3635
3470 $facedata->{version} == 2 3636 $facedata->{version} == 2
3471 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3472 3638
3473 # patch in the exptable 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3475 $facedata->{resource}{"res/exp_table"} = { 3641
3476 type => FT_RSRC, 3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3477 data => $exp_table, 3643
3478 hash => (Digest::MD5::md5 $exp_table), 3644 # BEGIN ATOMIC
3479 }; 3645 # from here on, everything must be atomic - no thread switch allowed
3480 cf::cede_to_tick; 3646 my $t1 = EV::time;
3481 3647
3482 { 3648 {
3483 my $faces = $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3484 3650
3485 while (my ($face, $info) = each %$faces) { 3651 for my $face (sort keys %$faces) {
3652 my $info = $faces->{$face};
3486 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487 3654
3488 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3489 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3493 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3494 cf::cede_to_tick; 3661 delete $cf::face::META[$idx];
3495 } 3662 }
3496 3663
3497 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3498 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3499 3666
3504 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3506 } else { 3673 } else {
3507 error "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3508 } 3675 }
3509
3510 cf::cede_to_tick;
3511 } 3676 }
3512 } 3677 }
3513 3678
3514 { 3679 {
3515 my $anims = $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3516 3681
3517 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3518 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3519 cf::cede_to_tick;
3520 } 3684 }
3521 3685
3522 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3523 } 3687 }
3524 3688
3525 { 3689 {
3526 my $res = $facedata->{resource}; 3690 my $res = $facedata->{resource};
3527 3691
3528 while (my ($name, $info) = each %$res) { 3692 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) { 3693 if (defined (my $type = $info->{type})) {
3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3530 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3531 3696
3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533 cf::face::set_type $idx, $info->{type}; 3697 cf::face::set_type $idx, $type;
3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3702 $cf::face::HASH{$info->{hash}} = $idx;
3534 } else { 3703 } else {
3535 $RESOURCE{$name} = $info; # unused 3704# $RESOURCE{$name} = $info; # unused
3536 } 3705 }
3537
3538 cf::cede_to_tick;
3539 } 3706 }
3540 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3541 3718
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3720
3721 aio_close $fh if $fh; # close old facedata
3543 3722
3544 1 3723 1
3545} 3724}
3546 3725
3547register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
3558 my $status = load_resource_file_ $_[0]; 3737 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100; 3738 get_slot 0.1, 100;
3560 cf::arch::commit_load; 3739 cf::arch::commit_load;
3561 3740
3562 $status 3741 $status
3742}
3743
3744sub reload_exp_table {
3745 _reload_exp_table;
3746
3747 cf::face::set
3748 "res/exp_table" => FT_RSRC,
3749 JSON::XS->new->utf8->canonical->encode (
3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3751 );
3752}
3753
3754sub reload_materials {
3755 _reload_materials;
3563} 3756}
3564 3757
3565sub reload_regions { 3758sub reload_regions {
3566 # HACK to clear player env face cache, we need some signal framework 3759 # HACK to clear player env face cache, we need some signal framework
3567 # for this (global event?) 3760 # for this (global event?)
3575 if exists $_->{match}; 3768 if exists $_->{match};
3576 } 3769 }
3577} 3770}
3578 3771
3579sub reload_facedata { 3772sub reload_facedata {
3580 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3581 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3582} 3775}
3583 3776
3584sub reload_archetypes { 3777sub reload_archetypes {
3585 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3586 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3780
3781 cf::face::set
3782 "res/skill_info" => FT_RSRC,
3783 JSON::XS->new->utf8->canonical->encode (
3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3785 );
3786
3787 cf::face::set
3788 "res/spell_paths" => FT_RSRC,
3789 JSON::XS->new->utf8->canonical->encode (
3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3587} 3806}
3588 3807
3589sub reload_treasures { 3808sub reload_treasures {
3590 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3591 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";
3612} 3831}
3613 3832
3614sub reload_resources { 3833sub reload_resources {
3615 trace "reloading resource files...\n"; 3834 trace "reloading resource files...\n";
3616 3835
3617 reload_exp_table;
3618 reload_materials; 3836 reload_materials;
3619 reload_facedata; 3837 reload_facedata;
3838 reload_exp_table;
3620 reload_sound; 3839 reload_sound;
3621 reload_archetypes; 3840 reload_archetypes;
3622 reload_regions; 3841 reload_regions;
3623 reload_treasures; 3842 reload_treasures;
3624 3843
3676 3895
3677sub main { 3896sub main {
3678 cf::init_globals; # initialise logging 3897 cf::init_globals; # initialise logging
3679 3898
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3899 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3900 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3901 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3902 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684 3903
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3904 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686 3905
3687 # we must not ever block the main coroutine 3906 # we must not ever block the main coroutine
3688 local $Coro::idle = sub { 3907 $Coro::idle = sub {
3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3908 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3690 (async { 3909 (async {
3691 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3910 $Coro::current->{desc} = "IDLE BUG HANDLER";
3692 EV::loop EV::LOOP_ONESHOT; 3911 EV::loop EV::LOOP_ONESHOT;
3693 })->prio (Coro::PRIO_MAX); 3912 })->prio (Coro::PRIO_MAX);
3696 evthread_start IO::AIO::poll_fileno; 3915 evthread_start IO::AIO::poll_fileno;
3697 3916
3698 cf::sync_job { 3917 cf::sync_job {
3699 cf::incloader::init (); 3918 cf::incloader::init ();
3700 3919
3920 db_init;
3921
3701 cf::init_anim; 3922 cf::init_anim;
3702 cf::init_attackmess; 3923 cf::init_attackmess;
3703 cf::init_dynamic; 3924 cf::init_dynamic;
3704 3925
3705 cf::load_settings; 3926 cf::load_settings;
3706 3927
3707 reload_resources; 3928 reload_resources;
3708 reload_config; 3929 reload_config;
3709 db_init;
3710 3930
3711 cf::init_uuid; 3931 cf::init_uuid;
3712 cf::init_signals; 3932 cf::init_signals;
3713 cf::init_skills; 3933 cf::init_skills;
3714 3934
3728 }; 3948 };
3729 3949
3730 cf::object::thawer::errors_are_fatal 0; 3950 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n"; 3951 info "parse errors in files are no longer fatal from this point on.\n";
3732 3952
3733 my $free_main; $free_main = EV::idle sub { 3953 AE::postpone {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :) 3954 undef &main; # free gobs of memory :)
3736 }; 3955 };
3737 3956
3738 goto &main_loop; 3957 goto &main_loop;
3739} 3958}
3896 4115
3897 cf::write_runtime_sync; # external watchdog should not bark 4116 cf::write_runtime_sync; # external watchdog should not bark
3898 4117
3899 trace "emergency_perl_save: flushing outstanding aio requests"; 4118 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) { 4119 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4120 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3902 } 4121 }
3903 4122
3904 cf::write_runtime_sync; # external watchdog should not bark 4123 cf::write_runtime_sync; # external watchdog should not bark
3905 }; 4124 };
3906 4125
4140 } 4359 }
4141} 4360}
4142 4361
4143{ 4362{
4144 # configure BDB 4363 # configure BDB
4364 info "initialising database";
4145 4365
4146 BDB::min_parallel 16; 4366 BDB::min_parallel 16;
4147 BDB::max_poll_reqs $TICK * 0.1; 4367 BDB::max_poll_reqs $TICK * 0.1;
4148 $AnyEvent::BDB::WATCHER->priority (1); 4368 #$AnyEvent::BDB::WATCHER->priority (1);
4149 4369
4150 unless ($DB_ENV) { 4370 unless ($DB_ENV) {
4151 $DB_ENV = BDB::db_env_create; 4371 $DB_ENV = BDB::db_env_create;
4152 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4153 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4373 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4178 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4398 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4179 }; 4399 };
4180 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4400 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4181 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4401 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4182 }; 4402 };
4403
4404 info "database initialised";
4183} 4405}
4184 4406
4185{ 4407{
4186 # configure IO::AIO 4408 # configure IO::AIO
4187 4409
4410 info "initialising aio";
4188 IO::AIO::min_parallel 8; 4411 IO::AIO::min_parallel 8;
4189 IO::AIO::max_poll_time $TICK * 0.1; 4412 IO::AIO::max_poll_time $TICK * 0.1;
4190 undef $AnyEvent::AIO::WATCHER; 4413 undef $AnyEvent::AIO::WATCHER;
4414 info "aio initialised";
4191} 4415}
4192 4416
4193our $_log_backtrace; 4417our $_log_backtrace;
4194our $_log_backtrace_last; 4418our $_log_backtrace_last;
4195 4419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines