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.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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 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."
1555 1683
1556 while (my ($k, $v) = each %todo) { 1684 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory}; 1686 if exists $v->{meta}{mandatory};
1559 } 1687 }
1688
1689 last;
1560 } 1690 }
1561 } 1691 }
1562 }; 1692 };
1563} 1693}
1564 1694
1823} 1953}
1824 1954
1825=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1826 1956
1827Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1828
1829=item $player->ext_reply ($msgid, @msg)
1830
1831Sends an ext reply to the player.
1832
1833=cut
1834
1835sub ext_reply($$@) {
1836 my ($self, $id, @msg) = @_;
1837
1838 $self->ns->ext_reply ($id, @msg)
1839}
1840 1958
1841=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1842 1960
1843Sends an ext event to the client. 1961Sends an ext event to the client.
1844 1962
1992 2110
1993 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1994 () 2112 ()
1995} 2113}
1996 2114
2115# may re-bless or do other evil things
1997sub init { 2116sub init {
1998 my ($self) = @_; 2117 my ($self) = @_;
1999 2118
2000 $self 2119 $self
2001} 2120}
2066 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
2067 2186
2068 1 2187 1
2069} 2188}
2070 2189
2190# used to laod the header of an original map
2071sub load_header_orig { 2191sub load_header_orig {
2072 my ($self) = @_; 2192 my ($self) = @_;
2073 2193
2074 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
2075} 2195}
2076 2196
2197# used to laod the header of an instantiated map
2077sub load_header_temp { 2198sub load_header_temp {
2078 my ($self) = @_; 2199 my ($self) = @_;
2079 2200
2080 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
2081} 2202}
2082 2203
2204# called after loading the header from an instantiated map
2083sub prepare_temp { 2205sub prepare_temp {
2084 my ($self) = @_; 2206 my ($self) = @_;
2085 2207
2086 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
2087 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
2088 # safety 2210 # safety
2089 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
2090 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
2091} 2213}
2092 2214
2215# called after loading the header from an original map
2093sub prepare_orig { 2216sub prepare_orig {
2094 my ($self) = @_; 2217 my ($self) = @_;
2095 2218
2096 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2097 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2123sub find { 2246sub find {
2124 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2125 2248
2126 cf::cede_to_tick; 2249 cf::cede_to_tick;
2127 2250
2128 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2129 2252
2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2131 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2132 2255
2133 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2164 2287
2165 { 2288 {
2166 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2167 2290
2168 return unless $self->valid; 2291 return unless $self->valid;
2169 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2170
2171 $self->in_memory (cf::MAP_LOADING);
2172 2293
2173 $self->alloc; 2294 $self->alloc;
2174 2295
2175 $self->pre_load; 2296 $self->pre_load;
2176 cf::cede_to_tick; 2297 cf::cede_to_tick;
2177 2298
2299 if (exists $self->{load_path}) {
2178 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2179 $f->skip_block; 2301 $f->skip_block;
2180 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2181 or return; 2303 or return;
2182 2304
2183 $self->post_load_original 2305 $self->post_load_original
2184 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2185 2307
2186 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2187 utf8::encode $uniq; 2309 utf8::encode $uniq;
2188 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2189 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2190 $self->clear_unique_items; 2312 $self->clear_unique_items;
2191 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2192 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2193 } 2316 }
2194 } 2317 }
2195 }
2196 2318
2197 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2198 2326
2199 cf::cede_to_tick; 2327 cf::cede_to_tick;
2200 # now do the right thing for maps 2328 # now do the right thing for maps
2201 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2202 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2206 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2207 $self->decay_objects; 2335 $self->decay_objects;
2208 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2209 $self->update_buttons; 2337 $self->update_buttons;
2210 cf::cede_to_tick; 2338 cf::cede_to_tick;
2211 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2212 } 2340 }
2213 2341
2214 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2215 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2216
2217 $self->in_memory (cf::MAP_ACTIVE);
2218 } 2344 }
2219 2345
2220 $self->post_load; 2346 $self->post_load;
2221 2347
2222 1 2348 1
2235# if $self->per_party; 2361# if $self->per_party;
2236 2362
2237 $self 2363 $self
2238} 2364}
2239 2365
2240# find and load all maps in the 3x3 area around a map
2241sub load_neighbours {
2242 my ($map) = @_;
2243
2244 my @neigh; # diagonal neighbours
2245
2246 for (0 .. 3) {
2247 my $neigh = $map->tile_path ($_)
2248 or next;
2249 $neigh = find $neigh, $map
2250 or next;
2251 $neigh->load;
2252
2253 # now find the diagonal neighbours
2254 push @neigh,
2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2257 }
2258
2259 for (grep defined $_->[0], @neigh) {
2260 my ($path, $origin) = @$_;
2261 my $neigh = find $path, $origin
2262 or next;
2263 $neigh->load;
2264 }
2265}
2266
2267sub find_sync { 2366sub find_sync {
2268 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2269 2368
2369 # it's a bug to call this from the main context
2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main; 2371 if $Coro::current == $Coro::main;
2272 2372
2273 find $path, $origin 2373 find $path, $origin
2274} 2374}
2275 2375
2276sub do_load_sync { 2376sub do_load_sync {
2277 my ($map) = @_; 2377 my ($map) = @_;
2278 2378
2379 # it's a bug to call this from the main context
2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2280 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2281 2382
2282 $map->load; 2383 $map->load;
2283} 2384}
2286our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2287 2388
2288sub find_async { 2389sub find_async {
2289 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2290 2391
2291 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2292 2393
2293 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2295 } 2396 }
2296 2397
2297 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2298 2399
2299 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2300 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2301 2402
2302 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2303 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2304 if (my $map = find $k) { 2405 if (my $map = find $k) {
2305 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2306 } 2407 }
2307 2408
2308 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2309 } 2410 }
2310 } 2411 }
2358sub swap_out { 2459sub swap_out {
2359 my ($self) = @_; 2460 my ($self) = @_;
2360 2461
2361 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362 2463
2363 return if $self->in_memory != cf::MAP_ACTIVE; 2464 return if !$self->linkable;
2364 return if $self->{deny_save}; 2465 return if $self->{deny_save};
2365 return if $self->players; 2466 return if $self->players;
2366 2467
2367 # first deactivate the map and "unlink" it from the core 2468 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate; 2469 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP; 2470 $_->clear_links_to ($self) for values %cf::MAP;
2370 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2371 2472
2372 # then atomically save 2473 # then atomically save
2373 $self->_save; 2474 $self->_save;
2374 2475
2375 # then free the map 2476 # then free the map
2401 2502
2402 return if $self->players; 2503 return if $self->players;
2403 2504
2404 cf::trace "resetting map ", $self->path, "\n"; 2505 cf::trace "resetting map ", $self->path, "\n";
2405 2506
2406 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2407 2508
2408 # need to save uniques path 2509 # need to save uniques path
2409 unless ($self->{deny_save}) { 2510 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq; 2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411 2512
2564 2665
2565Creates 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.
2566 2667
2567=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2568 2669
2569returns 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,
2570even if the object actually exists. May block. 2671even if the object actually exists. May block.
2571 2672
2572=cut 2673=cut
2573 2674
2574sub deref { 2675sub deref {
2656=item $player_object->may ("access") 2757=item $player_object->may ("access")
2657 2758
2658Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2659(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2660 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
2661=cut 2787=cut
2662 2788
2663sub cf::object::player::may { 2789sub cf::object::player::may {
2664 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2665 2791
2666 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2667 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2668 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2669 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2670} 2796}
2671 2797
2672=item $player_object->enter_link 2798=item $player_object->enter_link
2673 2799
2676The 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.
2677for 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,
2678though, 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
2679map. 2805map.
2680 2806
2681Will 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.
2682 2814
2683=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2684 2816
2685Moves 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
2686map. 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
2741 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2742 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2743 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2744 2876
2745 $map->load; 2877 $map->load;
2746 $map->load_neighbours;
2747 2878
2748 return unless $self->contr->active; 2879 return unless $self->contr->active;
2749 2880
2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2751 if ($self->enter_map ($map, $x, $y)) { 2882 if ($self->enter_map ($map, $x, $y)) {
2807 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2808 } 2939 }
2809 } 2940 }
2810 2941
2811 my $map = eval { 2942 my $map = eval {
2812 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2813 2944
2814 if ($map) { 2945 if ($map) {
2815 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2816 $map = $check->($map, $x, $y, $self) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2817 } else { 2948 } else {
2907 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2908 3039
2909 unless (eval { 3040 unless (eval {
2910 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2911 3042
2912 # random map handling
2913 {
2914 my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916 prepare_random_map $exit
2917 if $exit->slaying eq "/!";
2918 }
2919
2920 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2921 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2922 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 }
2923 3069
2924 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2925 3071
2926 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2942 3088
2943=head3 cf::client 3089=head3 cf::client
2944 3090
2945=over 4 3091=over 4
2946 3092
2947=item $client->send_drawinfo ($text, $flags)
2948
2949Sends a drawinfo packet to the client. Circumvents output buffering so
2950should not be used under normal circumstances.
2951
2952=cut
2953
2954sub cf::client::send_drawinfo {
2955 my ($self, $text, $flags) = @_;
2956
2957 utf8::encode $text;
2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2962 3094
2963Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required. 3096them as required.
2965 3097
2983 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2984} 3116}
2985 3117
2986=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2987 3119
2988Send 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
2989client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2990the 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
2991the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2992 3124
2993=cut 3125=cut
2994 3126
2995# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
3100 id => "death", 3232 id => "death",
3101 title => "Death", 3233 title => "Death",
3102 reply => undef, 3234 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
3104 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3105 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
3107); 3245);
3108 3246
3109sub cf::client::send_msg { 3247sub cf::client::send_msg {
3152=cut 3290=cut
3153 3291
3154sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3155 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3156 3294
3157 if ($self->extcmd == 2) {
3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3159 } elsif ($self->extcmd == 1) { # TODO: remove
3160 push @msg, msgtype => "event_$type";
3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3162 }
3163}
3164
3165=item $client->ext_reply ($msgid, @msg)
3166
3167Sends an ext reply to the client.
3168
3169=cut
3170
3171sub cf::client::ext_reply($$@) {
3172 my ($self, $id, @msg) = @_;
3173
3174 if ($self->extcmd == 2) {
3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3176 } elsif ($self->extcmd == 1) {
3177 #TODO: version 1, remove
3178 unshift @msg, msgtype => "reply", msgid => $id;
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180 }
3181} 3296}
3182 3297
3183=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3184 3299
3185Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3205 3320
3206 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3207 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3208 3323
3209 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;
3210} 3364}
3211 3365
3212cf::client->attach ( 3366cf::client->attach (
3213 on_connect => sub { 3367 on_connect => sub {
3214 my ($ns) = @_; 3368 my ($ns) = @_;
3240 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3241 3395
3242 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3243 3397
3244 if (ref $msg) { 3398 if (ref $msg) {
3245 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3246 "ARRAY" eq ref $msg
3247 ? @$msg
3248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3249 3400
3250 my @reply;
3251
3252 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}) {
3253 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3254 } 3419 }
3255
3256 $ns->ext_reply ($reply, @reply)
3257 if $reply;
3258
3259 } else { 3420 } else {
3260 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";
3261 } 3422 }
3262 3423
3263 cf::override; 3424 cf::override;
3431=cut 3592=cut
3432 3593
3433############################################################################# 3594#############################################################################
3434# the server's init and main functions 3595# the server's init and main functions
3435 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
3436sub load_facedata($) { 3674sub load_facedata($) {
3437 my ($path) = @_; 3675 my ($path) = @_;
3438 3676
3439 # HACK to clear player env face cache, we need some signal framework
3440 # for this (global event?)
3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3442
3443 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3444 3678
3445 trace "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3446 3680
3447 my $facedata = decode_storable load_file $path; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3448 3682
3449 $facedata->{version} == 2 3683 $facedata->{version} == 2
3450 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3451 3685
3452 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3454 $facedata->{resource}{"res/exp_table"} = { 3688
3455 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3456 data => $exp_table, 3690
3457 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3458 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3459 cf::cede_to_tick; 3693 my $t1 = EV::time;
3460 3694
3461 { 3695 {
3462 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3463 3697
3464 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3465 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466 3701
3467 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3468 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3469 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};
3470 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};
3471 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};
3472 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3473 cf::cede_to_tick; 3708 delete $cf::face::META[$idx];
3474 } 3709 }
3475 3710
3476 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3477 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3478 3713
3483 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3485 } else { 3720 } else {
3486 error "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3487 } 3722 }
3488
3489 cf::cede_to_tick;
3490 } 3723 }
3491 } 3724 }
3492 3725
3493 { 3726 {
3494 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3495 3728
3496 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3497 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3498 cf::cede_to_tick;
3499 } 3731 }
3500 3732
3501 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3502 } 3734 }
3503 3735
3504 { 3736 {
3505 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3506 3738
3507 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3508 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
3509 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3510 3743
3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3512 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;
3513 } else { 3750 } else {
3514 $RESOURCE{$name} = $info; # unused 3751# $RESOURCE{$name} = $info; # unused
3515 } 3752 }
3516
3517 cf::cede_to_tick;
3518 } 3753 }
3519 } 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;
3520 3765
3521 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
3522 3769
3523 1 3770 1
3524} 3771}
3525 3772
3526register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3537 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3538 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3539 cf::arch::commit_load; 3786 cf::arch::commit_load;
3540 3787
3541 $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;
3542} 3803}
3543 3804
3544sub reload_regions { 3805sub reload_regions {
3545 # 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
3546 # for this (global event?) 3807 # for this (global event?)
3554 if exists $_->{match}; 3815 if exists $_->{match};
3555 } 3816 }
3556} 3817}
3557 3818
3558sub reload_facedata { 3819sub reload_facedata {
3559 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3560 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3561} 3822}
3562 3823
3563sub reload_archetypes { 3824sub reload_archetypes {
3564 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3565 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;
3566} 3853}
3567 3854
3568sub reload_treasures { 3855sub reload_treasures {
3569 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3570 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3591} 3878}
3592 3879
3593sub reload_resources { 3880sub reload_resources {
3594 trace "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3595 3882
3596 reload_exp_table;
3597 reload_materials; 3883 reload_materials;
3598 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3599 reload_sound; 3886 reload_sound;
3600 reload_archetypes; 3887 reload_archetypes;
3601 reload_regions; 3888 reload_regions;
3602 reload_treasures; 3889 reload_treasures;
3603 3890
3643 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3644 print $fh $$; 3931 print $fh $$;
3645} 3932}
3646 3933
3647sub main_loop { 3934sub main_loop {
3648 trace "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3649 if (1) { 3936 if (1) {
3650 EV::loop; 3937 EV::run;
3651 } 3938 }
3652 trace "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3654} 3941}
3655 3942
3656sub main { 3943sub main {
3657 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3658 3945
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663 3950
3664 $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
3665 3952
3666 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3667 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3668 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#
3669 (async { 3956 (async {
3670 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3671 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3672 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3673 }; 3960 };
3674 3961
3675 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3676 3963
3677 cf::sync_job { 3964 cf::sync_job {
3678 cf::incloader::init (); 3965 cf::incloader::init ();
3966
3967 db_init;
3679 3968
3680 cf::init_anim; 3969 cf::init_anim;
3681 cf::init_attackmess; 3970 cf::init_attackmess;
3682 cf::init_dynamic; 3971 cf::init_dynamic;
3683 3972
3684 cf::load_settings; 3973 cf::load_settings;
3685 3974
3686 reload_resources; 3975 reload_resources;
3687 reload_config; 3976 reload_config;
3688 db_init;
3689 3977
3690 cf::init_uuid; 3978 cf::init_uuid;
3691 cf::init_signals; 3979 cf::init_signals;
3692 cf::init_skills; 3980 cf::init_skills;
3693 3981
3707 }; 3995 };
3708 3996
3709 cf::object::thawer::errors_are_fatal 0; 3997 cf::object::thawer::errors_are_fatal 0;
3710 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";
3711 3999
3712 my $free_main; $free_main = EV::idle sub { 4000 AE::postpone {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :) 4001 undef &main; # free gobs of memory :)
3715 }; 4002 };
3716 4003
3717 goto &main_loop; 4004 goto &main_loop;
3718} 4005}
3875 4162
3876 cf::write_runtime_sync; # external watchdog should not bark 4163 cf::write_runtime_sync; # external watchdog should not bark
3877 4164
3878 trace "emergency_perl_save: flushing outstanding aio requests"; 4165 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) { 4166 while (IO::AIO::nreqs || BDB::nreqs) {
3880 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
3881 } 4168 }
3882 4169
3883 cf::write_runtime_sync; # external watchdog should not bark 4170 cf::write_runtime_sync; # external watchdog should not bark
3884 }; 4171 };
3885 4172
4066 4353
4067############################################################################# 4354#############################################################################
4068 4355
4069my $bug_warning = 0; 4356my $bug_warning = 0;
4070 4357
4071our @WAIT_FOR_TICK;
4072our @WAIT_FOR_TICK_BEGIN;
4073
4074sub wait_for_tick() { 4358sub wait_for_tick() {
4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4076 4360
4077 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
4078 push @WAIT_FOR_TICK, $signal;
4079 $signal->wait;
4080} 4362}
4081 4363
4082sub wait_for_tick_begin() { 4364sub wait_for_tick_begin() {
4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4084 4366
4085 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
4086 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
4087 $signal->wait; 4369 $signal->wait;
4088} 4370}
4092 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"
4093 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
4094 return; 4376 return;
4095 } 4377 }
4096 4378
4097 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4098 4380
4099 #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#
4100 4382
4101 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4102 $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.;
4108 } 4390 }
4109 4391
4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4111 $sig->send; 4393 $sig->send;
4112 } 4394 }
4113 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
4114 $sig->send;
4115 }
4116 4396
4117 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4119 4399
4120 if (0) { 4400 if (0) {
4126 } 4406 }
4127} 4407}
4128 4408
4129{ 4409{
4130 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4131 4412
4132 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4133 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4134 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4135 4416
4136 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
4137 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4139 $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;
4164 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4165 }; 4446 };
4166 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4167 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4168 }; 4449 };
4450
4451 info "database initialised";
4169} 4452}
4170 4453
4171{ 4454{
4172 # configure IO::AIO 4455 # configure IO::AIO
4173 4456
4457 info "initialising aio";
4174 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4175 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4176 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4177} 4462}
4178 4463
4179our $_log_backtrace; 4464our $_log_backtrace;
4180our $_log_backtrace_last; 4465our $_log_backtrace_last;
4181 4466

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines