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.584 by root, Tue Oct 30 17:07:50 2012 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 6#
6# Deliantra is free software: you can redistribute it and/or modify it under 7# 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 8# 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 9# Free Software Foundation, either version 3 of the License, or (at your
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35use Carp (); 36use Carp ();
36 37
37use Guard (); 38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
38use Coro (); 42use Coro ();
39use Coro::State; 43use Coro::State;
40use Coro::Handle; 44use Coro::Handle;
41use Coro::EV; 45use Coro::EV;
42use Coro::AnyEvent; 46use Coro::AnyEvent;
48use Coro::AIO; 52use Coro::AIO;
49use Coro::BDB 1.6; 53use Coro::BDB 1.6;
50use Coro::Storable; 54use Coro::Storable;
51use Coro::Util (); 55use Coro::Util ();
52 56
57use Guard ();
53use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
54use BDB (); 59use BDB ();
55use Data::Dumper; 60use Data::Dumper;
56use Fcntl; 61use Fcntl;
57use YAML::XS (); 62use YAML::XS ();
63use CBOR::XS ();
58use IO::AIO (); 64use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 65use Compress::LZF;
61use Digest::MD5 (); 66use Digest::MD5 ();
62 67
63AnyEvent::detect; 68AnyEvent::detect;
64 69
83our %COMMAND = (); 88our %COMMAND = ();
84our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
85 90
86our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
88our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
91 98
92our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 100our @EVENT;
220=item $cf::RUNTIME 227=item $cf::RUNTIME
221 228
222The time this server has run, starts at 0 and is increased by $cf::TICK on 229The time this server has run, starts at 0 and is increased by $cf::TICK on
223every server tick. 230every server tick.
224 231
225=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228 235
229Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
230directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
232database environment. 239database environment.
246Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
247from wherever your confdir points to. 254from wherever your confdir points to.
248 255
249=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
250 257
251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 258These are functions that inhibit the current coroutine one tick.
252returns directly I<after> the tick processing (and consequently, can only wake one thread 259cf::wait_for_tick_begin only returns directly I<after> the tick
260processing (and consequently, can only wake one thread per tick), while
253per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 261cf::wait_for_tick wakes up all waiters after tick processing.
254 262
255Note that cf::Wait_for_tick will immediately return when the server is not 263Note that cf::wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run 264ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really> 265when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>). 266want to wait, use C<$cf::WAIT_FOR_TICK>).
259 267
260=item $cf::WAIT_FOR_TICK 268=item $cf::WAIT_FOR_TICK
336)) { 344)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 346}
339 347
340$EV::DIED = sub { 348$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 349 warn "error in event callback: $@";
342}; 350};
343 351
344############################################################################# 352#############################################################################
345 353
346sub fork_call(&@); 354sub fork_call(&@);
458 466
459sub decode_yaml($) { 467sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_ 468 fork_call { YAML::XS::Load $_[0] } @_
461} 469}
462 470
471=item $scalar = cf::decode_cbor $scalar
472
473Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
474blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
475alternative.
476
477=cut
478
479sub decode_cbor($) {
480 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
481 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
482 CBOR::XS::decode_cbor $_[0]
483}
484
463=item $scalar = cf::unlzf $scalar 485=item $scalar = cf::unlzf $scalar
464 486
465Same as Compress::LZF::compress, but takes server ticks into account, so 487Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks. 488blocks.
467 489
504 } 526 }
505} 527}
506 528
507=item cf::lock_wait $string 529=item cf::lock_wait $string
508 530
509Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
510 532
511=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
512 534
513Wait until the given lock is available and then acquires it and returns 535Wait until the given lock is available and then acquires it and returns
514a L<Guard> object. If the guard object gets destroyed (goes out of scope, 536a L<Guard> object. If the guard object gets destroyed (goes out of scope,
567Allocate $time seconds of blocking CPU time at priority C<$priority> 589Allocate $time seconds of blocking CPU time at priority C<$priority>
568(default: 0): This call blocks and returns only when you have at least 590(default: 0): This call blocks and returns only when you have at least
569C<$time> seconds of cpu time till the next tick. The slot is only valid 591C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede. 592till the next cede.
571 593
572Background jobs should use a priority les than zero, interactive jobs 594Background jobs should use a priority less than zero, interactive jobs
573should use 100 or more. 595should use 100 or more.
574 596
575The optional C<$name> can be used to identify the job to run. It might be 597The optional C<$name> can be used to identify the job to run. It might be
576used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
577 599
590 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
591 my $busy; 613 my $busy;
592 614
593 while () { 615 while () {
594 next_job: 616 next_job:
617
618 Coro::cede;
595 619
596 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
597 621
598 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
599 if ($SLOT_QUEUE[$_][0] <= $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0; 624 $busy = 0;
601 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
602 $job->[2]->send; 626 $job->[2]->send;
603 Coro::cede;
604 goto next_job; 627 goto next_job;
605 } else { 628 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
607 } 630 }
608 } 631 }
609 632
610 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
611 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
612 $WAIT_FOR_TICK->wait;
613 } else { 635 } else {
614 $busy = 0; 636 $busy = 0;
615 Coro::schedule; 637 Coro::schedule;
616 } 638 }
617 } 639 }
643BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
644 666
645=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
646 668
647The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
648is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
649partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 671partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
650acceptable. 672acceptable.
651 673
652If it must be done, put the blocking parts into C<sync_job>. This will run 674If it must be done, put the blocking parts into C<sync_job>. This will run
653the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
681 703
682 while ($busy) { 704 while ($busy) {
683 if (Coro::nready) { 705 if (Coro::nready) {
684 Coro::cede_notself; 706 Coro::cede_notself;
685 } else { 707 } else {
686 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
687 } 709 }
688 } 710 }
689 711
690 my $time = AE::time - $time; 712 my $time = AE::time - $time;
691 713
732 reset_signals; 754 reset_signals;
733} 755}
734 756
735sub fork_call(&@) { 757sub fork_call(&@) {
736 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
737
738 # we seemingly have to make a local copy of the whole thing,
739 # otherwise perl prematurely frees the stuff :/
740 # TODO: investigate and fix (likely this will be rather laborious)
741 759
742 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
743 cf::post_fork; 761 cf::post_fork;
744 &$cb 762 &$cb
745 } @args; 763 } @args;
895 913
896 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
897 } 915 }
898 } 916 }
899 917
900 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
901 my $data = $process->(\@data); 919 my $data = $process->(\@data);
902 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
903 921
904 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905 923
906 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
907 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
1427=cut 1445=cut
1428 1446
1429############################################################################# 1447#############################################################################
1430# command handling &c 1448# command handling &c
1431 1449
1432=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1433 1451
1434Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1435$name. 1453$name.
1436 1454
1437=cut 1455=cut
1443 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1444 1462
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1464}
1447 1465
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1467
1450Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1453the logged-in player. Ext commands can only be processed after a player 1471the logged-in player. Ext commands can only be processed after a player
1454has logged in successfully. 1472has logged in successfully.
1455 1473
1456If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1457called.
1458 1475
1476=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1477
1478Same as C<cf::register_extcmd>, but instead of returning values, the
1479callback needs to clal the C<$reply> function.
1480
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1482
1461Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1462exticmd packet. Exti commands are processed by the server as soon as they 1484exticmd packet. Exti commands are processed by the server as soon as they
1463are received, i.e. out of order w.r.t. other commands. The first argument 1485are received, i.e. out of order w.r.t. other commands. The first argument
1464is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1465log-in. 1487log-in.
1466 1488
1467If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1468called.
1469 1490
1470=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 1492
1493Same as C<cf::register_extcmd>, but instead of returning values, the
1494callback needs to clal the C<$reply> function.
1495
1496=cut
1497
1472sub register_extcmd { 1498sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1474 1500
1475 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1476} 1502}
1477 1503
1478sub register_exticmd { 1504sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1480 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1481 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1514}
1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1482} 1520}
1483 1521
1484use File::Glob (); 1522use File::Glob ();
1485 1523
1486cf::player->attach ( 1524cf::player->attach (
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1541
1504 if (ref $msg) { 1542 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1544
1507 my @reply;
1508
1509 if (my $cb = $EXTCMD{$type}) { 1545 if (my $cb = $EXTACMD{$type}) {
1546 $cb->(
1547 $pl,
1548 sub {
1549 $pl->ext_msg ("reply-$reply", @_)
1550 if $reply;
1551 },
1552 @payload
1553 );
1554 } else {
1555 my @reply;
1556
1557 if (my $cb = $EXTCMD{$type}) {
1510 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1511 } 1563 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1564
1516 } else { 1565 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1567 }
1519 1568
1905} 1954}
1906 1955
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1957
1909Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1910
1911=item $player->ext_reply ($msgid, @msg)
1912
1913Sends an ext reply to the player.
1914
1915=cut
1916
1917sub ext_reply($$@) {
1918 my ($self, $id, @msg) = @_;
1919
1920 $self->ns->ext_reply ($id, @msg)
1921}
1922 1959
1923=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1924 1961
1925Sends an ext event to the client. 1962Sends an ext event to the client.
1926 1963
2363 2400
2364 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2365 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2366 2403
2367 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2368 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2369 if (my $map = find $k) { 2406 if (my $map = find $k) {
2370 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2371 } 2408 }
2372 2409
2373 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2374 } 2411 }
2375 } 2412 }
2629 2666
2630Creates and returns a persistent reference to an object that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2631 2668
2632=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2633 2670
2634returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2671returns the objetc referenced by refstring. may return undef when it cannot find the object,
2635even if the object actually exists. May block. 2672even if the object actually exists. May block.
2636 2673
2637=cut 2674=cut
2638 2675
2639sub deref { 2676sub deref {
2721=item $player_object->may ("access") 2758=item $player_object->may ("access")
2722 2759
2723Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2724(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2725 2762
2763This is implemented by checking a config setting of C<may_access> where
2764C<access> is replaced by the access string. The following alternatives are
2765possible (and are tested in order):
2766
2767=over 4
2768
2769=item * Player is DM
2770
2771The request will succeed.
2772
2773=item * may_access is an array reference
2774
2775If either the player nickname or UUID is in the array, the request will
2776succeed, otherwise it will fail.
2777
2778=item * may_access is a true value
2779
2780The request will succeed.
2781
2782=item * may_access is missing or false
2783
2784The request will fail.
2785
2786=back
2787
2726=cut 2788=cut
2727 2789
2728sub cf::object::player::may { 2790sub cf::object::player::may {
2729 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2730 2792
2731 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2732 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2733 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2734 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2735} 2797}
2736 2798
2737=item $player_object->enter_link 2799=item $player_object->enter_link
2738 2800
2741The player should be reasonably safe there for short amounts of time (e.g. 2803The player should be reasonably safe there for short amounts of time (e.g.
2742for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2804for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2743though, as the player cannot control the character while it is on the link 2805though, as the player cannot control the character while it is on the link
2744map. 2806map.
2745 2807
2746Will never block. 2808This method will never block, which is the whole reaosn for it's
2809existance: you can I<always> put a player onto the link map, which is the
2810only place to put objects that is guaranteed to exist.
2811
2812A typical usage pattern is to call C<enter_link> synchronously from the
2813server, then start a new thread, do your blocking stuff there and then
2814call C<leave_link> from that thread.
2747 2815
2748=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2749 2817
2750Moves the player out of the special C<{link}> map onto the specified 2818Moves the player out of the special C<{link}> map onto the specified
2751map. If the map is not valid (or omitted), the player will be moved back 2819map. If the map is not valid (or omitted), the player will be moved back
3021 3089
3022=head3 cf::client 3090=head3 cf::client
3023 3091
3024=over 4 3092=over 4
3025 3093
3026=item $client->send_drawinfo ($text, $flags)
3027
3028Sends a drawinfo packet to the client. Circumvents output buffering so
3029should not be used under normal circumstances.
3030
3031=cut
3032
3033sub cf::client::send_drawinfo {
3034 my ($self, $text, $flags) = @_;
3035
3036 utf8::encode $text;
3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt) 3094=item $client->send_big_packet ($pkt)
3041 3095
3042Like C<send_packet>, but tries to compress large packets, and fragments 3096Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required. 3097them as required.
3044 3098
3062 $self->send_packet ($pkt); 3116 $self->send_packet ($pkt);
3063} 3117}
3064 3118
3065=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
3066 3120
3067Send a drawinfo or msg packet to the client, formatting the msg for the 3121Send a msg packet to the client, formatting the msg for the client if
3068client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
3069the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
3070the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
3071 3125
3072=cut 3126=cut
3073 3127
3074# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
3117 }, 3171 },
3118 "c/body" => { 3172 "c/body" => {
3119 id => "infobox", 3173 id => "infobox",
3120 title => "Body Parts", 3174 title => "Body Parts",
3121 reply => undef, 3175 reply => undef,
3122 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
3123 }, 3177 },
3124 "c/statistics" => { 3178 "c/statistics" => {
3125 id => "infobox", 3179 id => "infobox",
3126 title => "Statistics", 3180 title => "Statistics",
3127 reply => undef, 3181 reply => undef,
3179 id => "death", 3233 id => "death",
3180 title => "Death", 3234 title => "Death",
3181 reply => undef, 3235 reply => undef,
3182 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
3183 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
3184 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
3185 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
3186); 3246);
3187 3247
3188sub cf::client::send_msg { 3248sub cf::client::send_msg {
3231=cut 3291=cut
3232 3292
3233sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
3235 3295
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242}
3243
3244=item $client->ext_reply ($msgid, @msg)
3245
3246Sends an ext reply to the client.
3247
3248=cut
3249
3250sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3297}
3257 3298
3258=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
3259 3300
3260Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
3280 3321
3281 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
3282 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
3283 3324
3284 1 3325 1
3326}
3327
3328=item $client->update_command_faces
3329
3330=cut
3331
3332our %COMMAND_FACE;
3333
3334sub cf::client::update_command_faces {
3335 my ($self) = @_;
3336
3337 my @faces = grep $_,
3338 $COMMAND_FACE{preferred},
3339 $COMMAND_FACE{standard},
3340 $COMMAND_FACE{skill},
3341 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3342 $COMMAND_FACE{emote},
3343 ;
3344
3345 $self->send_face ($_)
3346 for @faces;
3347 $self->flush_fx;
3348
3349 $self->ext_msg (command_list => @faces);
3350}
3351
3352=item cf::client::set_command_face $type, $commands
3353
3354=cut
3355
3356sub cf::client::set_command_face {
3357 my ($type, $list) = @_;
3358
3359 my $idx = &cf::face::set ( #d# ugly forward reference
3360 "command_list/$type" => cf::FT_RSRC,
3361 JSON::XS->new->utf8->encode ([ sort @$list ])
3362 );
3363
3364 $COMMAND_FACE{$type} = $idx;
3285} 3365}
3286 3366
3287cf::client->attach ( 3367cf::client->attach (
3288 on_connect => sub { 3368 on_connect => sub {
3289 my ($ns) = @_; 3369 my ($ns) = @_;
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3398
3319 if (ref $msg) { 3399 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3401
3322 my @reply;
3323
3324 if (my $cb = $EXTICMD{$type}) { 3402 if (my $cb = $EXTIACMD{$type}) {
3403 $cb->(
3404 $ns,
3405 sub {
3406 $ns->ext_msg ("reply-$reply", @_)
3407 if $reply;
3408 },
3409 @payload
3410 );
3411 } else {
3412 my @reply;
3413
3414 if (my $cb = $EXTICMD{$type}) {
3325 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3326 } 3420 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3421 } else {
3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3422 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333 } 3423 }
3334 3424
3335 cf::override; 3425 cf::override;
3503=cut 3593=cut
3504 3594
3505############################################################################# 3595#############################################################################
3506# the server's init and main functions 3596# the server's init and main functions
3507 3597
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3598{
3599 package cf::face;
3600
3601 our %HASH; # hash => idx
3602 our @DATA; # dynamically-created facedata, only faceste 0 used
3603 our @FOFS; # file offset, if > 0
3604 our @SIZE; # size of face, in octets
3605 our @META; # meta hash of face, if any
3606 our $DATAFH; # facedata filehandle
3607
3608 # internal api, not finalised
3609 sub set {
3610 my ($name, $type, $data) = @_;
3611
3612 my $idx = cf::face::find $name;
3613
3614 if ($idx) {
3615 delete $HASH{cf::face::get_csum $idx};
3616 } else {
3617 $idx = cf::face::alloc $name;
3618 }
3619
3620 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3621
3622 cf::face::set_type $idx, $type;
3623 cf::face::set_csum $idx, 0, $hash;
3624
3625 # we need to destroy the SV itself, not just modify it, as a running ix
3626 # might hold a reference to it: "delete" achieves that.
3627 delete $FOFS[0][$idx];
3628 delete $DATA[0][$idx];
3629 $DATA[0][$idx] = $data;
3630 $SIZE[0][$idx] = length $data;
3631 delete $META[$idx];
3632 $HASH{$hash} = $idx;#d#
3633
3634 $idx
3635 }
3636
3637 sub _get_data($$$) {
3638 my ($idx, $set, $cb) = @_;
3639
3640 if (defined $DATA[$set][$idx]) {
3641 $cb->($DATA[$set][$idx]);
3642 } elsif (my $fofs = $FOFS[$set][$idx]) {
3643 my $size = $SIZE[$set][$idx];
3644 my $buf;
3645 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3646 if ($_[0] == $size) {
3647 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3648 $cb->($buf);
3649 } else {
3650 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3651 }
3652 };
3653 } else {
3654 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3655 }
3656 }
3657
3658 # rather ineffient
3659 sub cf::face::get_data($;$) {
3660 my ($idx, $set) = @_;
3661
3662 _get_data $idx, $set, Coro::rouse_cb;
3663 Coro::rouse_wait
3664 }
3665
3666 sub cf::face::ix {
3667 my ($ns, $set, $idx, $pri) = @_;
3668
3669 _get_data $idx, $set, sub {
3670 $ns->ix_send ($idx, $pri, $_[0]);
3671 };
3672 }
3673}
3509 3674
3510sub load_facedata($) { 3675sub load_facedata($) {
3511 my ($path) = @_; 3676 my ($path) = @_;
3512 3677
3513 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?)
3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3516
3517 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3518 3679
3519 trace "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3520 3681
3521 my $facedata = decode_storable load_file $path; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3522 3683
3523 $facedata->{version} == 2 3684 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3525 3686
3526 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3528 $facedata->{resource}{"res/exp_table"} = { 3689
3529 type => FT_RSRC, 3690 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3530 data => $exp_table, 3691
3531 hash => (Digest::MD5::md5 $exp_table), 3692 # BEGIN ATOMIC
3532 }; 3693 # from here on, everything must be atomic - no thread switch allowed
3533 cf::cede_to_tick; 3694 my $t1 = EV::time;
3534 3695
3535 { 3696 {
3536 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3537 3698
3538 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3539 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3540 3702
3541 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3542 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3705 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3706 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3546 $FACEHASH{$info->{hash64}} = $idx;#d# 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3547 3709 delete $cf::face::META[$idx];
3548 cf::cede_to_tick;
3549 } 3710 }
3550 3711
3551 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3552 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3553 3714
3558 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3560 } else { 3721 } else {
3561 error "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3562 } 3723 }
3563
3564 cf::cede_to_tick;
3565 } 3724 }
3566 } 3725 }
3567 3726
3568 { 3727 {
3569 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3570 3729
3571 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3572 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3573 cf::cede_to_tick;
3574 } 3732 }
3575 3733
3576 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3577 } 3735 }
3578 3736
3582 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3583 if (defined (my $type = $info->{type})) { 3741 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue 3742 # TODO: different hash - must free and use new index, or cache ixface data queue
3585 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3586 3744
3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3588 cf::face::set_type $idx, $type; 3745 cf::face::set_type $idx, $type;
3746 cf::face::set_csum $idx, 0, $info->{hash};
3747 $cf::face::SIZE[0][$idx] = $info->{size};
3748 $cf::face::FOFS[0][$idx] = $info->{fofs};
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3749 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d# 3750 $cf::face::HASH{$info->{hash}} = $idx;
3591 } else { 3751 } else {
3592# $RESOURCE{$name} = $info; # unused 3752# $RESOURCE{$name} = $info; # unused
3593 } 3753 }
3594
3595 cf::cede_to_tick;
3596 } 3754 }
3597 } 3755 }
3756
3757 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3758
3759 # HACK to clear player env face cache, we need some signal framework
3760 # for this (global event?)
3761 %ext::player_env::MUSIC_FACE_CACHE = ();
3762
3763 # END ATOMIC
3764
3765 cf::debug "facedata atomic update time ", EV::time - $t1;
3598 3766
3599 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3768
3769 aio_close $fh if $fh; # close old facedata
3600 3770
3601 1 3771 1
3602} 3772}
3603 3773
3604register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3615 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3616 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3617 cf::arch::commit_load; 3787 cf::arch::commit_load;
3618 3788
3619 $status 3789 $status
3790}
3791
3792sub reload_exp_table {
3793 _reload_exp_table;
3794
3795 cf::face::set
3796 "res/exp_table" => FT_RSRC,
3797 JSON::XS->new->utf8->canonical->encode (
3798 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3799 );
3800}
3801
3802sub reload_materials {
3803 _reload_materials;
3620} 3804}
3621 3805
3622sub reload_regions { 3806sub reload_regions {
3623 # HACK to clear player env face cache, we need some signal framework 3807 # HACK to clear player env face cache, we need some signal framework
3624 # for this (global event?) 3808 # for this (global event?)
3632 if exists $_->{match}; 3816 if exists $_->{match};
3633 } 3817 }
3634} 3818}
3635 3819
3636sub reload_facedata { 3820sub reload_facedata {
3637 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3638 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3639} 3823}
3640 3824
3641sub reload_archetypes { 3825sub reload_archetypes {
3642 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3643 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3828
3829 cf::face::set
3830 "res/skill_info" => FT_RSRC,
3831 JSON::XS->new->utf8->canonical->encode (
3832 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3833 );
3834
3835 cf::face::set
3836 "res/spell_paths" => FT_RSRC,
3837 JSON::XS->new->utf8->canonical->encode (
3838 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3839 );
3840
3841 # command completion
3842 my @commands;
3843
3844 for (0..cf::arch::skillvec_size - 1) {
3845 my $skill = cf::arch::skillvec $_;
3846 my $name = $skill->name;
3847 my $flags = cf::skill_flags $skill->subtype;
3848
3849 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3850 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3851 }
3852
3853 cf::client::set_command_face skill => \@commands;
3644} 3854}
3645 3855
3646sub reload_treasures { 3856sub reload_treasures {
3647 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3648 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3669} 3879}
3670 3880
3671sub reload_resources { 3881sub reload_resources {
3672 trace "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3673 3883
3674 reload_exp_table;
3675 reload_materials; 3884 reload_materials;
3676 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3677 reload_sound; 3887 reload_sound;
3678 reload_archetypes; 3888 reload_archetypes;
3679 reload_regions; 3889 reload_regions;
3680 reload_treasures; 3890 reload_treasures;
3681 3891
3721 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3722 print $fh $$; 3932 print $fh $$;
3723} 3933}
3724 3934
3725sub main_loop { 3935sub main_loop {
3726 trace "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3727 if (1) { 3937 if (1) {
3728 EV::loop; 3938 EV::run;
3729 } 3939 }
3730 trace "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3731 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3732} 3942}
3733 3943
3734sub main { 3944sub main {
3735 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3736 3946
3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3947 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3948 LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3949 LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741 3952
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3953 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743 3954
3744 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3745 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3957 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3747 (async { 3958 (async {
3748 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3749 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3750 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3751 }; 3962 };
3752 3963
3753 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3754 3965
3755 cf::sync_job { 3966 cf::sync_job {
3756 cf::incloader::init (); 3967 cf::incloader::init ();
3968
3969 db_init;
3757 3970
3758 cf::init_anim; 3971 cf::init_anim;
3759 cf::init_attackmess; 3972 cf::init_attackmess;
3760 cf::init_dynamic; 3973 cf::init_dynamic;
3761 3974
3762 cf::load_settings; 3975 cf::load_settings;
3763 3976
3764 reload_resources; 3977 reload_resources;
3765 reload_config; 3978 reload_config;
3766 db_init;
3767 3979
3768 cf::init_uuid; 3980 cf::init_uuid;
3769 cf::init_signals; 3981 cf::init_signals;
3770 cf::init_skills; 3982 cf::init_skills;
3771 3983
4196 } 4408 }
4197} 4409}
4198 4410
4199{ 4411{
4200 # configure BDB 4412 # configure BDB
4413 info "initialising database";
4201 4414
4202 BDB::min_parallel 16; 4415 BDB::min_parallel 16;
4203 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
4204 #$AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
4205 4418
4234 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4235 }; 4448 };
4236 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4237 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4238 }; 4451 };
4452
4453 info "database initialised";
4239} 4454}
4240 4455
4241{ 4456{
4242 # configure IO::AIO 4457 # configure IO::AIO
4243 4458
4459 info "initialising aio";
4244 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
4245 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
4246 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
4247} 4464}
4248 4465
4249our $_log_backtrace; 4466our $_log_backtrace;
4250our $_log_backtrace_last; 4467our $_log_backtrace_last;
4251 4468

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines