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.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 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 ();
62use CBOR::XS ();
58use IO::AIO (); 63use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 64use Compress::LZF;
61use Digest::MD5 (); 65use Digest::MD5 ();
62 66
63AnyEvent::detect; 67AnyEvent::detect;
64 68
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
108our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 118
113our %RESOURCE; # unused 119#our %RESOURCE; # unused
114 120
115our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
117 123
118our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
129our $DB_ENV; 135our $DB_ENV;
130 136
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 138
133our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 141
135our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
137our $NOW; 145our $NOW;
138 146
139our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
150 158
151our @POST_INIT; 159our @POST_INIT;
152 160
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
155 166
156binmode STDOUT; 167binmode STDOUT;
157binmode STDERR; 168binmode STDERR;
158 169
159# read virtual server time, if available 170# read virtual server time, if available
193 204
194=over 4 205=over 4
195 206
196=item $cf::UPTIME 207=item $cf::UPTIME
197 208
198The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
199 225
200=item $cf::RUNTIME 226=item $cf::RUNTIME
201 227
202The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 229every server tick.
204 230
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 234
209Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
212database environment. 238database environment.
213 239
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 240=item $cf::LOADAVG
223 241
224The current CPU load on the server (alpha-smoothed), as a value between 0 242The 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 243(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
234Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235from wherever your confdir points to. 253from wherever your confdir points to.
236 254
237=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
238 256
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
240returns directly I<after> the tick processing (and consequently, can only wake one thread 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
242 273
243=cut 274=cut
244 275
245sub wait_for_tick(); 276sub wait_for_tick();
246sub wait_for_tick_begin(); 277sub wait_for_tick_begin();
312)) { 343)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 345}
315 346
316$EV::DIED = sub { 347$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
318}; 349};
319 350
320############################################################################# 351#############################################################################
321 352
322sub fork_call(&@); 353sub fork_call(&@);
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 381 $d
351 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
352} 383}
353 384
354=item $scalar = load_file $path 385=item $scalar = cf::load_file $path
355 386
356Loads the given file from path and returns its contents. Croaks on error 387Loads the given file from path and returns its contents. Croaks on error
357and can block. 388and can block.
358 389
359=cut 390=cut
363 or Carp::croak "$_[0]: $!"; 394 or Carp::croak "$_[0]: $!";
364 395
365 $data 396 $data
366} 397}
367 398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
368=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
369 438
370Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
371 440
372=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
394 463
395=cut 464=cut
396 465
397sub decode_yaml($) { 466sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_ 467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
399} 482}
400 483
401=item $scalar = cf::unlzf $scalar 484=item $scalar = cf::unlzf $scalar
402 485
403Same as Compress::LZF::compress, but takes server ticks into account, so 486Same as Compress::LZF::compress, but takes server ticks into account, so
442 } 525 }
443} 526}
444 527
445=item cf::lock_wait $string 528=item cf::lock_wait $string
446 529
447Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
448 531
449=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
450 533
451Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
452a L<Guard> object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
505Allocate $time seconds of blocking CPU time at priority C<$priority> 588Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least 589(default: 0): This call blocks and returns only when you have at least
507C<$time> seconds of cpu time till the next tick. The slot is only valid 590C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede. 591till the next cede.
509 592
510Background jobs should use a priority les than zero, interactive jobs 593Background jobs should use a priority less than zero, interactive jobs
511should use 100 or more. 594should use 100 or more.
512 595
513The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
515 598
528 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
529 my $busy; 612 my $busy;
530 613
531 while () { 614 while () {
532 next_job: 615 next_job:
616
617 Coro::cede;
533 618
534 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
535 620
536 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0; 623 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send; 625 $job->[2]->send;
541 Coro::cede;
542 goto next_job; 626 goto next_job;
543 } else { 627 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 } 629 }
546 } 630 }
547 631
548 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else { 634 } else {
553 $busy = 0; 635 $busy = 0;
554 Coro::schedule; 636 Coro::schedule;
555 } 637 }
556 } 638 }
582BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
583 665
584=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
585 667
586The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
587is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
589acceptable. 671acceptable.
590 672
591If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
592the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
620 702
621 while ($busy) { 703 while ($busy) {
622 if (Coro::nready) { 704 if (Coro::nready) {
623 Coro::cede_notself; 705 Coro::cede_notself;
624 } else { 706 } else {
625 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
626 } 708 }
627 } 709 }
628 710
629 my $time = AE::time - $time; 711 my $time = AE::time - $time;
630 712
671 reset_signals; 753 reset_signals;
672} 754}
673 755
674sub fork_call(&@) { 756sub fork_call(&@) {
675 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
676
677 # we seemingly have to make a local copy of the whole thing,
678 # otherwise perl prematurely frees the stuff :/
679 # TODO: investigate and fix (likely this will be rather laborious)
680 758
681 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
682 cf::post_fork; 760 cf::post_fork;
683 &$cb 761 &$cb
684 } @args; 762 } @args;
834 912
835 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
836 } 914 }
837 } 915 }
838 916
839 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
840 my $data = $process->(\@data); 918 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
842 920
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844 922
845 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
1366=cut 1444=cut
1367 1445
1368############################################################################# 1446#############################################################################
1369# command handling &c 1447# command handling &c
1370 1448
1371=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1372 1450
1373Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1374$name. 1452$name.
1375 1453
1376=cut 1454=cut
1382 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1383 1461
1384 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1385} 1463}
1386 1464
1387=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1388 1466
1389Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully. 1471has logged in successfully.
1394 1472
1395If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1396called.
1397 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1398=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1399 1481
1400Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd 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 1484are 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 1485is a client socket. Exti commands can be received anytime, even before
1404log-in. 1486log-in.
1405 1487
1406If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1407called.
1408 1489
1409=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1411sub register_extcmd { 1497sub register_extcmd($$) {
1412 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1413 1499
1414 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1415} 1501}
1416 1502
1417sub register_exticmd { 1503sub register_async_extcmd($$) {
1418 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1419 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1420 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1421} 1519}
1422 1520
1423use File::Glob (); 1521use File::Glob ();
1424 1522
1425cf::player->attach ( 1523cf::player->attach (
1439 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1440 1538
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1540
1443 if (ref $msg) { 1541 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1542 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 1543
1449 my @reply;
1450
1451 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1453 } 1562 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457 1563
1458 } else { 1564 } else {
1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460 } 1566 }
1461 1567
1474 }; 1580 };
1475 1581
1476 $grp 1582 $grp
1477} 1583}
1478 1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1479sub load_extensions { 1596sub load_extensions {
1480 info "loading extensions..."; 1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1481 1600
1482 cf::sync_job { 1601 cf::sync_job {
1483 my %todo; 1602 my %todo;
1484 1603
1485 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1528 unless exists $done{$_}; 1647 unless exists $done{$_};
1529 } 1648 }
1530 1649
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1651
1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1533 my $active = eval $v->{source}; 1661 my $active = eval $source;
1534 1662
1535 if (length $@) { 1663 if (length $@) {
1536 error "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1537 1665
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1825} 1953}
1826 1954
1827=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828 1956
1829Expand deliantra pod fragments into protocol xml. 1957Expand 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 1958
1843=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1844 1960
1845Sends an ext event to the client. 1961Sends an ext event to the client.
1846 1962
1954 # {... are special paths that are not being touched 2070 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2071 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2072 # ?random/... random maps
1957 # /... normal maps 2073 # /... normal maps
1958 # ~user/... per-player map of a specific user 2074 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2075
1961 $path =~ s/$PATH_SEP/\//go; 2076 $path =~ s/$PATH_SEP/\//go;
1962 2077
1963 # treat it as relative path if it starts with 2078 # treat it as relative path if it starts with
1964 # something that looks reasonable 2079 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2080 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2081 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2082
1968 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2084 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 2085 }
1985 2086
1986 for ($path) { 2087 for ($path) {
1987 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
2186 2287
2187 { 2288 {
2188 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2189 2290
2190 return unless $self->valid; 2291 return unless $self->valid;
2191 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2192
2193 $self->in_memory (cf::MAP_LOADING);
2194 2293
2195 $self->alloc; 2294 $self->alloc;
2196 2295
2197 $self->pre_load; 2296 $self->pre_load;
2198 cf::cede_to_tick; 2297 cf::cede_to_tick;
2221 } else { 2320 } else {
2222 $self->post_load_original 2321 $self->post_load_original
2223 if delete $self->{load_original}; 2322 if delete $self->{load_original};
2224 } 2323 }
2225 2324
2325 $self->state (cf::MAP_INACTIVE);
2326
2226 cf::cede_to_tick; 2327 cf::cede_to_tick;
2227 # now do the right thing for maps 2328 # now do the right thing for maps
2228 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2229 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2230 unless $self->difficulty; 2331 unless $self->difficulty;
2233 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2234 $self->decay_objects; 2335 $self->decay_objects;
2235 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2236 $self->update_buttons; 2337 $self->update_buttons;
2237 cf::cede_to_tick; 2338 cf::cede_to_tick;
2238 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2239 } 2340 }
2240 2341
2241 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2243
2244 $self->in_memory (cf::MAP_ACTIVE);
2245 } 2344 }
2246 2345
2247 $self->post_load; 2346 $self->post_load;
2248 2347
2249 1 2348 1
2262# if $self->per_party; 2361# if $self->per_party;
2263 2362
2264 $self 2363 $self
2265} 2364}
2266 2365
2267# find and load all maps in the 3x3 area around a map
2268sub load_neighbours {
2269 my ($map) = @_;
2270
2271 my @neigh; # diagonal neighbours
2272
2273 for (0 .. 3) {
2274 my $neigh = $map->tile_path ($_)
2275 or next;
2276 $neigh = find $neigh, $map
2277 or next;
2278 $neigh->load;
2279
2280 # now find the diagonal neighbours
2281 push @neigh,
2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2284 }
2285
2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
2288 my $neigh = find $path, $origin
2289 or next;
2290 $neigh->load;
2291 }
2292}
2293
2294sub find_sync { 2366sub find_sync {
2295 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2296 2368
2369 # it's a bug to call this from the main context
2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main; 2371 if $Coro::current == $Coro::main;
2299 2372
2300 find $path, $origin 2373 find $path, $origin
2301} 2374}
2302 2375
2303sub do_load_sync { 2376sub do_load_sync {
2304 my ($map) = @_; 2377 my ($map) = @_;
2305 2378
2379 # it's a bug to call this from the main context
2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2308 2382
2309 $map->load; 2383 $map->load;
2310} 2384}
2316 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2317 2391
2318 $path = normalise $path, $origin; 2392 $path = normalise $path, $origin;
2319 2393
2320 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2322 } 2396 }
2323 2397
2324 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2325 2399
2326 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2327 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2328 2402
2329 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2330 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2331 if (my $map = find $k) { 2405 if (my $map = find $k) {
2332 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2333 } 2407 }
2334 2408
2335 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2336 } 2410 }
2337 } 2411 }
2385sub swap_out { 2459sub swap_out {
2386 my ($self) = @_; 2460 my ($self) = @_;
2387 2461
2388 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389 2463
2390 return if $self->in_memory != cf::MAP_ACTIVE; 2464 return if !$self->linkable;
2391 return if $self->{deny_save}; 2465 return if $self->{deny_save};
2392 return if $self->players; 2466 return if $self->players;
2393 2467
2394 # first deactivate the map and "unlink" it from the core 2468 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate; 2469 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP; 2470 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2398 2472
2399 # then atomically save 2473 # then atomically save
2400 $self->_save; 2474 $self->_save;
2401 2475
2402 # then free the map 2476 # then free the map
2428 2502
2429 return if $self->players; 2503 return if $self->players;
2430 2504
2431 cf::trace "resetting map ", $self->path, "\n"; 2505 cf::trace "resetting map ", $self->path, "\n";
2432 2506
2433 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2434 2508
2435 # need to save uniques path 2509 # need to save uniques path
2436 unless ($self->{deny_save}) { 2510 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq; 2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438 2512
2591 2665
2592Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2593 2667
2594=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2595 2669
2596returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2597even if the object actually exists. May block. 2671even if the object actually exists. May block.
2598 2672
2599=cut 2673=cut
2600 2674
2601sub deref { 2675sub deref {
2683=item $player_object->may ("access") 2757=item $player_object->may ("access")
2684 2758
2685Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2686(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2687 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2688=cut 2787=cut
2689 2788
2690sub cf::object::player::may { 2789sub cf::object::player::may {
2691 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2692 2791
2693 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2694 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2695 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2696 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2697} 2796}
2698 2797
2699=item $player_object->enter_link 2798=item $player_object->enter_link
2700 2799
2703The player should be reasonably safe there for short amounts of time (e.g. 2802The player should be reasonably safe there for short amounts of time (e.g.
2704for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2705though, as the player cannot control the character while it is on the link 2804though, as the player cannot control the character while it is on the link
2706map. 2805map.
2707 2806
2708Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2709 2814
2710=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2711 2816
2712Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2713map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2768 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2769 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2770 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2771 2876
2772 $map->load; 2877 $map->load;
2773 $map->load_neighbours;
2774 2878
2775 return unless $self->contr->active; 2879 return unless $self->contr->active;
2776 2880
2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778 if ($self->enter_map ($map, $x, $y)) { 2882 if ($self->enter_map ($map, $x, $y)) {
2934 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2935 3039
2936 unless (eval { 3040 unless (eval {
2937 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2938 3042
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp; 3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
2950 3069
2951 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2952 3071
2953 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2969 3088
2970=head3 cf::client 3089=head3 cf::client
2971 3090
2972=over 4 3091=over 4
2973 3092
2974=item $client->send_drawinfo ($text, $flags)
2975
2976Sends a drawinfo packet to the client. Circumvents output buffering so
2977should not be used under normal circumstances.
2978
2979=cut
2980
2981sub cf::client::send_drawinfo {
2982 my ($self, $text, $flags) = @_;
2983
2984 utf8::encode $text;
2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2989 3094
2990Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required. 3096them as required.
2992 3097
3010 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
3011} 3116}
3012 3117
3013=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
3014 3119
3015Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
3016client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
3017the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
3018the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
3019 3124
3020=cut 3125=cut
3021 3126
3022# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
3065 }, 3170 },
3066 "c/body" => { 3171 "c/body" => {
3067 id => "infobox", 3172 id => "infobox",
3068 title => "Body Parts", 3173 title => "Body Parts",
3069 reply => undef, 3174 reply => undef,
3070 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
3071 }, 3176 },
3072 "c/statistics" => { 3177 "c/statistics" => {
3073 id => "infobox", 3178 id => "infobox",
3074 title => "Statistics", 3179 title => "Statistics",
3075 reply => undef, 3180 reply => undef,
3127 id => "death", 3232 id => "death",
3128 title => "Death", 3233 title => "Death",
3129 reply => undef, 3234 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
3131 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3132 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
3134); 3245);
3135 3246
3136sub cf::client::send_msg { 3247sub cf::client::send_msg {
3179=cut 3290=cut
3180 3291
3181sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3183 3294
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $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} 3296}
3209 3297
3210=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3211 3299
3212Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3232 3320
3233 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3234 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3235 3323
3236 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
3237} 3364}
3238 3365
3239cf::client->attach ( 3366cf::client->attach (
3240 on_connect => sub { 3367 on_connect => sub {
3241 my ($ns) = @_; 3368 my ($ns) = @_;
3267 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3268 3395
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3397
3271 if (ref $msg) { 3398 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3399 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 3400
3277 my @reply;
3278
3279 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3281 } 3419 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else { 3420 } else {
3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288 } 3422 }
3289 3423
3290 cf::override; 3424 cf::override;
3458=cut 3592=cut
3459 3593
3460############################################################################# 3594#############################################################################
3461# the server's init and main functions 3595# the server's init and main functions
3462 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3463sub load_facedata($) { 3674sub load_facedata($) {
3464 my ($path) = @_; 3675 my ($path) = @_;
3465 3676
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; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471 3678
3472 trace "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3473 3680
3474 my $facedata = decode_storable load_file $path; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3475 3682
3476 $facedata->{version} == 2 3683 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3478 3685
3479 # patch in the exptable 3686 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]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3481 $facedata->{resource}{"res/exp_table"} = { 3688
3482 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3483 data => $exp_table, 3690
3484 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3485 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3486 cf::cede_to_tick; 3693 my $t1 = EV::time;
3487 3694
3488 { 3695 {
3489 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3490 3697
3491 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3701
3494 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3499 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3500 cf::cede_to_tick; 3708 delete $cf::face::META[$idx];
3501 } 3709 }
3502 3710
3503 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3504 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3505 3713
3510 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3512 } else { 3720 } else {
3513 error "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3514 } 3722 }
3515
3516 cf::cede_to_tick;
3517 } 3723 }
3518 } 3724 }
3519 3725
3520 { 3726 {
3521 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3522 3728
3523 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3524 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3525 cf::cede_to_tick;
3526 } 3731 }
3527 3732
3528 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3529 } 3734 }
3530 3735
3531 { 3736 {
3532 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3533 3738
3534 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # 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; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3743
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3540 } else { 3750 } else {
3541 $RESOURCE{$name} = $info; # unused 3751# $RESOURCE{$name} = $info; # unused
3542 } 3752 }
3543
3544 cf::cede_to_tick;
3545 } 3753 }
3546 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3547 3765
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3767
3768 aio_close $fh if $fh; # close old facedata
3549 3769
3550 1 3770 1
3551} 3771}
3552 3772
3553register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3564 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3786 cf::arch::commit_load;
3567 3787
3568 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3569} 3803}
3570 3804
3571sub reload_regions { 3805sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?) 3807 # for this (global event?)
3581 if exists $_->{match}; 3815 if exists $_->{match};
3582 } 3816 }
3583} 3817}
3584 3818
3585sub reload_facedata { 3819sub reload_facedata {
3586 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3587 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3588} 3822}
3589 3823
3590sub reload_archetypes { 3824sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3592 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3593} 3853}
3594 3854
3595sub reload_treasures { 3855sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3618} 3878}
3619 3879
3620sub reload_resources { 3880sub reload_resources {
3621 trace "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3622 3882
3623 reload_exp_table;
3624 reload_materials; 3883 reload_materials;
3625 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3626 reload_sound; 3886 reload_sound;
3627 reload_archetypes; 3887 reload_archetypes;
3628 reload_regions; 3888 reload_regions;
3629 reload_treasures; 3889 reload_treasures;
3630 3890
3670 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3671 print $fh $$; 3931 print $fh $$;
3672} 3932}
3673 3933
3674sub main_loop { 3934sub main_loop {
3675 trace "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3676 if (1) { 3936 if (1) {
3677 EV::loop; 3937 EV::run;
3678 } 3938 }
3679 trace "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3681} 3941}
3682 3942
3683sub main { 3943sub main {
3684 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3685 3945
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3950
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3952
3693 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3956 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3699 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3700 }; 3960 };
3701 3961
3702 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3703 3963
3704 cf::sync_job { 3964 cf::sync_job {
3705 cf::incloader::init (); 3965 cf::incloader::init ();
3966
3967 db_init;
3706 3968
3707 cf::init_anim; 3969 cf::init_anim;
3708 cf::init_attackmess; 3970 cf::init_attackmess;
3709 cf::init_dynamic; 3971 cf::init_dynamic;
3710 3972
3711 cf::load_settings; 3973 cf::load_settings;
3712 3974
3713 reload_resources; 3975 reload_resources;
3714 reload_config; 3976 reload_config;
3715 db_init;
3716 3977
3717 cf::init_uuid; 3978 cf::init_uuid;
3718 cf::init_signals; 3979 cf::init_signals;
3719 cf::init_skills; 3980 cf::init_skills;
3720 3981
3734 }; 3995 };
3735 3996
3736 cf::object::thawer::errors_are_fatal 0; 3997 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3998 info "parse errors in files are no longer fatal from this point on.\n";
3738 3999
3739 my $free_main; $free_main = EV::idle sub { 4000 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 4001 undef &main; # free gobs of memory :)
3742 }; 4002 };
3743 4003
3744 goto &main_loop; 4004 goto &main_loop;
3745} 4005}
3902 4162
3903 cf::write_runtime_sync; # external watchdog should not bark 4163 cf::write_runtime_sync; # external watchdog should not bark
3904 4164
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4165 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4166 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 4168 }
3909 4169
3910 cf::write_runtime_sync; # external watchdog should not bark 4170 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4171 };
3912 4172
4093 4353
4094############################################################################# 4354#############################################################################
4095 4355
4096my $bug_warning = 0; 4356my $bug_warning = 0;
4097 4357
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4358sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4360
4104 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4362}
4108 4363
4109sub wait_for_tick_begin() { 4364sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4366
4112 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4369 $signal->wait;
4115} 4370}
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
4121 return; 4376 return;
4122 } 4377 }
4123 4378
4124 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4125 4380
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4382
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4135 } 4390 }
4136 4391
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4393 $sig->send;
4139 } 4394 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4396
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4399
4147 if (0) { 4400 if (0) {
4153 } 4406 }
4154} 4407}
4155 4408
4156{ 4409{
4157 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4158 4412
4159 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4416
4163 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4420 $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 { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4446 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4449 };
4450
4451 info "database initialised";
4196} 4452}
4197 4453
4198{ 4454{
4199 # configure IO::AIO 4455 # configure IO::AIO
4200 4456
4457 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4204} 4462}
4205 4463
4206our $_log_backtrace; 4464our $_log_backtrace;
4207our $_log_backtrace_last; 4465our $_log_backtrace_last;
4208 4466

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines