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.552 by root, Mon May 17 21:12:59 2010 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; # unused 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
115 122
116our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
127our $DB_ENV; 134our $DB_ENV;
128 135
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 137
131our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 140
133our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
135our $NOW; 144our $NOW;
136 145
137our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
148 157
149our @POST_INIT; 158our @POST_INIT;
150 159
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
153 165
154binmode STDOUT; 166binmode STDOUT;
155binmode STDERR; 167binmode STDERR;
156 168
157# read virtual server time, if available 169# read virtual server time, if available
191 203
192=over 4 204=over 4
193 205
194=item $cf::UPTIME 206=item $cf::UPTIME
195 207
196The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
197 224
198=item $cf::RUNTIME 225=item $cf::RUNTIME
199 226
200The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 228every server tick.
202 229
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 233
207Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
210database environment. 237database environment.
211 238
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 239=item $cf::LOADAVG
221 240
222The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 252from wherever your confdir points to.
234 253
235=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
236 255
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
240 272
241=cut 273=cut
242 274
243sub wait_for_tick(); 275sub wait_for_tick();
244sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
310)) { 342)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 344}
313 345
314$EV::DIED = sub { 346$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
316}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
317 354
318############################################################################# 355#############################################################################
319 356
320=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
321 358
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 380 $d
344 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
345} 382}
346 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
347=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
348 437
349Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
350 439
351=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 447
359sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
361 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
362=item $ref = cf::yaml_load $scalar 459=item $ref = cf::decode_yaml $scalar
363 460
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 462
366=cut 463=cut
367 464
368sub fork_call(&@); 465sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
372} 480}
373 481
374=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
375 483
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
460 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
461} 569}
462 570
463=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
464 572
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
467of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
468 580
469The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
471 583
472Useful for short background jobs. 584Useful for short background jobs.
484 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
485 my $busy; 597 my $busy;
486 598
487 while () { 599 while () {
488 next_job: 600 next_job:
601
602 Coro::cede;
489 603
490 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
491 605
492 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
493 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0; 608 $busy = 0;
495 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
496 $job->[2]->send; 610 $job->[2]->send;
497 Coro::cede;
498 goto next_job; 611 goto next_job;
499 } else { 612 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
501 } 614 }
502 } 615 }
503 616
504 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
506 push @cf::WAIT_FOR_TICK, $signal;
507 $signal->wait;
508 } else { 619 } else {
509 $busy = 0; 620 $busy = 0;
510 Coro::schedule; 621 Coro::schedule;
511 } 622 }
512 } 623 }
627 reset_signals; 738 reset_signals;
628} 739}
629 740
630sub fork_call(&@) { 741sub fork_call(&@) {
631 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
632
633 # we seemingly have to make a local copy of the whole thing,
634 # otherwise perl prematurely frees the stuff :/
635 # TODO: investigate and fix (likely this will be rather laborious)
636 743
637 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
638 cf::post_fork; 745 cf::post_fork;
639 &$cb 746 &$cb
640 } @args; 747 } @args;
767 874
768 my @data; 875 my @data;
769 my $md5; 876 my $md5;
770 877
771 for (0 .. $#$src) { 878 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 880 }
775 881
776 # if processing is expensive, check 882 # if processing is expensive, check
777 # checksum first 883 # checksum first
778 if (1) { 884 if (1) {
791 897
792 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
793 } 899 }
794 } 900 }
795 901
796 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
797 my $data = $process->(\@data); 903 my $data = $process->(\@data);
798 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
799 905
800 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801 907
802 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
803 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1323=cut 1429=cut
1324 1430
1325############################################################################# 1431#############################################################################
1326# command handling &c 1432# command handling &c
1327 1433
1328=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1329 1435
1330Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1331$name. 1437$name.
1332 1438
1333=cut 1439=cut
1339 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1340 1446
1341 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1342} 1448}
1343 1449
1344=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1345 1451
1346Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1347extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1348received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1349the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1350has logged in successfully. 1456has logged in successfully.
1351 1457
1352If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1353called.
1354 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1355=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1356 1466
1357Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1358exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1359are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1360is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1361log-in. 1471log-in.
1362 1472
1363If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1364called.
1365 1474
1366=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1368sub register_extcmd { 1482sub register_extcmd($$) {
1369 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1370 1484
1371 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1372} 1486}
1373 1487
1374sub register_exticmd { 1488sub register_async_extcmd($$) {
1375 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1376 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1377 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1378} 1504}
1379 1505
1380use File::Glob (); 1506use File::Glob ();
1381 1507
1382cf::player->attach ( 1508cf::player->attach (
1396 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1397 1523
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1525
1400 if (ref $msg) { 1526 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405 1528
1406 my @reply;
1407
1408 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1410 } 1547 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414 1548
1415 } else { 1549 } else {
1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417 } 1551 }
1418 1552
1431 }; 1565 };
1432 1566
1433 $grp 1567 $grp
1434} 1568}
1435 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1436sub load_extensions { 1581sub load_extensions {
1437 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1438 1585
1439 cf::sync_job { 1586 cf::sync_job {
1440 my %todo; 1587 my %todo;
1441 1588
1442 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1485 unless exists $done{$_}; 1632 unless exists $done{$_};
1486 } 1633 }
1487 1634
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1490 my $active = eval $v->{source}; 1646 my $active = eval $source;
1491 1647
1492 if (length $@) { 1648 if (length $@) {
1493 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1494 1650
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1512 1668
1513 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1516 } 1672 }
1673
1674 last;
1517 } 1675 }
1518 } 1676 }
1519 }; 1677 };
1520} 1678}
1521 1679
1781 1939
1782=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783 1941
1784Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1785 1943
1786=item $player->ext_reply ($msgid, @msg)
1787
1788Sends an ext reply to the player.
1789
1790=cut
1791
1792sub ext_reply($$@) {
1793 my ($self, $id, @msg) = @_;
1794
1795 $self->ns->ext_reply ($id, @msg)
1796}
1797
1798=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1799 1945
1800Sends an ext event to the client. 1946Sends an ext event to the client.
1801 1947
1802=cut 1948=cut
1861sub generate_random_map { 2007sub generate_random_map {
1862 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1863 2009
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 2011
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1871 $rmp->{exit_on_final_map},
1872 $rmp->{xsize}, $rmp->{ysize},
1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1875 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1876 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1877 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1878 (cf::region::find $rmp->{region}), $rmp->{custom}
1879 )
1880} 2013}
1881 2014
1882=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1883 2016
1884Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1962 2095
1963 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1964 () 2097 ()
1965} 2098}
1966 2099
2100# may re-bless or do other evil things
1967sub init { 2101sub init {
1968 my ($self) = @_; 2102 my ($self) = @_;
1969 2103
1970 $self 2104 $self
1971} 2105}
2036 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
2037 2171
2038 1 2172 1
2039} 2173}
2040 2174
2175# used to laod the header of an original map
2041sub load_header_orig { 2176sub load_header_orig {
2042 my ($self) = @_; 2177 my ($self) = @_;
2043 2178
2044 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
2045} 2180}
2046 2181
2182# used to laod the header of an instantiated map
2047sub load_header_temp { 2183sub load_header_temp {
2048 my ($self) = @_; 2184 my ($self) = @_;
2049 2185
2050 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2051} 2187}
2052 2188
2189# called after loading the header from an instantiated map
2053sub prepare_temp { 2190sub prepare_temp {
2054 my ($self) = @_; 2191 my ($self) = @_;
2055 2192
2056 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2057 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2058 # safety 2195 # safety
2059 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2060 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2061} 2198}
2062 2199
2200# called after loading the header from an original map
2063sub prepare_orig { 2201sub prepare_orig {
2064 my ($self) = @_; 2202 my ($self) = @_;
2065 2203
2066 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2067 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2093sub find { 2231sub find {
2094 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2095 2233
2096 cf::cede_to_tick; 2234 cf::cede_to_tick;
2097 2235
2098 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2099 2237
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2101 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2102 2240
2103 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2134 2272
2135 { 2273 {
2136 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2137 2275
2138 return unless $self->valid; 2276 return unless $self->valid;
2139 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2140
2141 $self->in_memory (cf::MAP_LOADING);
2142 2278
2143 $self->alloc; 2279 $self->alloc;
2144 2280
2145 $self->pre_load; 2281 $self->pre_load;
2146 cf::cede_to_tick; 2282 cf::cede_to_tick;
2147 2283
2284 if (exists $self->{load_path}) {
2148 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block; 2286 $f->skip_block;
2150 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2151 or return; 2288 or return;
2152 2289
2153 $self->post_load_original 2290 $self->post_load_original
2154 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2155 2292
2156 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2157 utf8::encode $uniq; 2294 utf8::encode $uniq;
2158 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2160 $self->clear_unique_items; 2297 $self->clear_unique_items;
2161 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2163 } 2301 }
2164 } 2302 }
2165 }
2166 2303
2167 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2168 2311
2169 cf::cede_to_tick; 2312 cf::cede_to_tick;
2170 # now do the right thing for maps 2313 # now do the right thing for maps
2171 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2172 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2176 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2177 $self->decay_objects; 2320 $self->decay_objects;
2178 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2179 $self->update_buttons; 2322 $self->update_buttons;
2180 cf::cede_to_tick; 2323 cf::cede_to_tick;
2181 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2182 } 2325 }
2183 2326
2184 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2186
2187 $self->in_memory (cf::MAP_ACTIVE);
2188 } 2329 }
2189 2330
2190 $self->post_load; 2331 $self->post_load;
2332
2333 1
2191} 2334}
2192 2335
2193# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2203# if $self->per_party; 2346# if $self->per_party;
2204 2347
2205 $self 2348 $self
2206} 2349}
2207 2350
2208# find and load all maps in the 3x3 area around a map
2209sub load_neighbours {
2210 my ($map) = @_;
2211
2212 my @neigh; # diagonal neighbours
2213
2214 for (0 .. 3) {
2215 my $neigh = $map->tile_path ($_)
2216 or next;
2217 $neigh = find $neigh, $map
2218 or next;
2219 $neigh->load;
2220
2221 # now find the diagonal neighbours
2222 push @neigh,
2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2225 }
2226
2227 for (grep defined $_->[0], @neigh) {
2228 my ($path, $origin) = @$_;
2229 my $neigh = find $path, $origin
2230 or next;
2231 $neigh->load;
2232 }
2233}
2234
2235sub find_sync { 2351sub find_sync {
2236 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2237 2353
2354 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main; 2356 if $Coro::current == $Coro::main;
2240 2357
2241 find $path, $origin 2358 find $path, $origin
2242} 2359}
2243 2360
2244sub do_load_sync { 2361sub do_load_sync {
2245 my ($map) = @_; 2362 my ($map) = @_;
2246 2363
2364 # it's a bug to call this from the main context
2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2248 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2249 2367
2250 $map->load; 2368 $map->load;
2251} 2369}
2254our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2255 2373
2256sub find_async { 2374sub find_async {
2257 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2258 2376
2259 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2260 2378
2261 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2262 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2263 } 2381 }
2264 2382
2265 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2266 2384
2267 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2326sub swap_out { 2444sub swap_out {
2327 my ($self) = @_; 2445 my ($self) = @_;
2328 2446
2329 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330 2448
2331 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2332 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2333 return if $self->players; 2451 return if $self->players;
2334 2452
2335 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate; 2454 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2338 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2339 2457
2340 # then atomically save 2458 # then atomically save
2341 $self->_save; 2459 $self->_save;
2342 2460
2343 # then free the map 2461 # then free the map
2369 2487
2370 return if $self->players; 2488 return if $self->players;
2371 2489
2372 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2373 2491
2374 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2375 2493
2376 # need to save uniques path 2494 # need to save uniques path
2377 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379 2497
2532 2650
2533Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2534 2652
2535=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2536 2654
2537returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2538even if the object actually exists. May block. 2656even if the object actually exists. May block.
2539 2657
2540=cut 2658=cut
2541 2659
2542sub deref { 2660sub deref {
2709 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2710 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2711 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2712 2830
2713 $map->load; 2831 $map->load;
2714 $map->load_neighbours;
2715 2832
2716 return unless $self->contr->active; 2833 return unless $self->contr->active;
2717 2834
2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2719 if ($self->enter_map ($map, $x, $y)) { 2836 if ($self->enter_map ($map, $x, $y)) {
2775 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2776 } 2893 }
2777 } 2894 }
2778 2895
2779 my $map = eval { 2896 my $map = eval {
2780 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2781 2898
2782 if ($map) { 2899 if ($map) {
2783 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2784 $map = $check->($map, $x, $y, $self) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2785 } else { 2902 } else {
2875 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2876 2993
2877 unless (eval { 2994 unless (eval {
2878 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2879 2996
2880 # random map handling
2881 {
2882 my $guard = cf::lock_acquire "exit_prepare:$exit";
2883
2884 prepare_random_map $exit
2885 if $exit->slaying eq "/!";
2886 }
2887
2888 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2889 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2891 3023
2892 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2893 3025
2894 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2910 3042
2911=head3 cf::client 3043=head3 cf::client
2912 3044
2913=over 4 3045=over 4
2914 3046
2915=item $client->send_drawinfo ($text, $flags)
2916
2917Sends a drawinfo packet to the client. Circumvents output buffering so
2918should not be used under normal circumstances.
2919
2920=cut
2921
2922sub cf::client::send_drawinfo {
2923 my ($self, $text, $flags) = @_;
2924
2925 utf8::encode $text;
2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
2930 3048
2931Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required. 3050them as required.
2933 3051
2951 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
2952} 3070}
2953 3071
2954=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2955 3073
2956Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2957client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2958the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2959the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2960 3078
2961=cut 3079=cut
2962 3080
2963# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
3068 id => "death", 3186 id => "death",
3069 title => "Death", 3187 title => "Death",
3070 reply => undef, 3188 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3072 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3073 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3075); 3199);
3076 3200
3077sub cf::client::send_msg { 3201sub cf::client::send_msg {
3120=cut 3244=cut
3121 3245
3122sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3123 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3124 3248
3125 if ($self->extcmd == 2) {
3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3127 } elsif ($self->extcmd == 1) { # TODO: remove
3128 push @msg, msgtype => "event_$type";
3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3130 }
3131}
3132
3133=item $client->ext_reply ($msgid, @msg)
3134
3135Sends an ext reply to the client.
3136
3137=cut
3138
3139sub cf::client::ext_reply($$@) {
3140 my ($self, $id, @msg) = @_;
3141
3142 if ($self->extcmd == 2) {
3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3144 } elsif ($self->extcmd == 1) {
3145 #TODO: version 1, remove
3146 unshift @msg, msgtype => "reply", msgid => $id;
3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3148 }
3149} 3250}
3150 3251
3151=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3152 3253
3153Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
3173 3274
3174 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3175 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3176 3277
3177 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
3178} 3317}
3179 3318
3180cf::client->attach ( 3319cf::client->attach (
3181 on_connect => sub { 3320 on_connect => sub {
3182 my ($ns) = @_; 3321 my ($ns) = @_;
3208 my ($ns, $buf) = @_; 3347 my ($ns, $buf) = @_;
3209 3348
3210 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3349 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3211 3350
3212 if (ref $msg) { 3351 if (ref $msg) {
3213 my ($type, $reply, @payload) = 3352 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3214 "ARRAY" eq ref $msg
3215 ? @$msg
3216 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3217 3353
3218 my @reply;
3219
3220 if (my $cb = $EXTICMD{$type}) { 3354 if (my $cb = $EXTIACMD{$type}) {
3355 $cb->(
3356 $ns,
3357 sub {
3358 $ns->ext_msg ("reply-$reply", @_)
3359 if $reply;
3360 },
3361 @payload
3362 );
3363 } else {
3364 my @reply;
3365
3366 if (my $cb = $EXTICMD{$type}) {
3221 @reply = $cb->($ns, @payload); 3367 @reply = $cb->($ns, @payload);
3368 }
3369
3370 $ns->ext_msg ("reply-$reply", @reply)
3371 if $reply;
3222 } 3372 }
3223
3224 $ns->ext_reply ($reply, @reply)
3225 if $reply;
3226
3227 } else { 3373 } else {
3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3374 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3229 } 3375 }
3230 3376
3231 cf::override; 3377 cf::override;
3399=cut 3545=cut
3400 3546
3401############################################################################# 3547#############################################################################
3402# the server's init and main functions 3548# the server's init and main functions
3403 3549
3550{
3551 package cf::face;
3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3560 # internal api, not finalised
3561 sub set {
3562 my ($name, $type, $data) = @_;
3563
3564 my $idx = cf::face::find $name;
3565
3566 if ($idx) {
3567 delete $HASH{cf::face::get_csum $idx};
3568 } else {
3569 $idx = cf::face::alloc $name;
3570 }
3571
3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3573
3574 cf::face::set_type $idx, $type;
3575 cf::face::set_csum $idx, 0, $hash;
3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3584 $HASH{$hash} = $idx;#d#
3585
3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3625}
3626
3404sub load_facedata($) { 3627sub load_facedata($) {
3405 my ($path) = @_; 3628 my ($path) = @_;
3406 3629
3407 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?)
3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3410
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3631
3413 trace "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3414 3633
3415 0 < aio_load $path, my $facedata 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3416 or die "$path: $!";
3417
3418 $facedata = Coro::Storable::thaw $facedata;
3419 3635
3420 $facedata->{version} == 2 3636 $facedata->{version} == 2
3421 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3422 3638
3423 # patch in the exptable 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3425 $facedata->{resource}{"res/exp_table"} = { 3641
3426 type => FT_RSRC, 3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3427 data => $exp_table, 3643
3428 hash => (Digest::MD5::md5 $exp_table), 3644 # BEGIN ATOMIC
3429 }; 3645 # from here on, everything must be atomic - no thread switch allowed
3430 cf::cede_to_tick; 3646 my $t1 = EV::time;
3431 3647
3432 { 3648 {
3433 my $faces = $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3434 3650
3435 while (my ($face, $info) = each %$faces) { 3651 for my $face (sort keys %$faces) {
3652 my $info = $faces->{$face};
3436 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3437 3654
3438 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3439 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3442 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3443 cf::cede_to_tick; 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3661 delete $cf::face::META[$idx];
3444 } 3662 }
3445 3663
3446 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3447 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3448 3666
3453 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3455 } else { 3673 } else {
3456 error "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3457 } 3675 }
3458
3459 cf::cede_to_tick;
3460 } 3676 }
3461 } 3677 }
3462 3678
3463 { 3679 {
3464 my $anims = $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3465 3681
3466 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3467 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3468 cf::cede_to_tick;
3469 } 3684 }
3470 3685
3471 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3472 } 3687 }
3473 3688
3474 { 3689 {
3475 my $res = $facedata->{resource}; 3690 my $res = $facedata->{resource};
3476 3691
3477 while (my ($name, $info) = each %$res) { 3692 while (my ($name, $info) = each %$res) {
3478 if (defined $info->{type}) { 3693 if (defined (my $type = $info->{type})) {
3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3479 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3480 3696
3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3482 cf::face::set_type $idx, $info->{type}; 3697 cf::face::set_type $idx, $type;
3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3702 $cf::face::HASH{$info->{hash}} = $idx;
3483 } else { 3703 } else {
3484 $RESOURCE{$name} = $info; # unused 3704# $RESOURCE{$name} = $info; # unused
3485 } 3705 }
3486
3487 cf::cede_to_tick;
3488 } 3706 }
3489 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3490 3718
3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3720
3721 aio_close $fh if $fh; # close old facedata
3492 3722
3493 1 3723 1
3494} 3724}
3495 3725
3496register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
3507 my $status = load_resource_file_ $_[0]; 3737 my $status = load_resource_file_ $_[0];
3508 get_slot 0.1, 100; 3738 get_slot 0.1, 100;
3509 cf::arch::commit_load; 3739 cf::arch::commit_load;
3510 3740
3511 $status 3741 $status
3742}
3743
3744sub reload_exp_table {
3745 _reload_exp_table;
3746
3747 cf::face::set
3748 "res/exp_table" => FT_RSRC,
3749 JSON::XS->new->utf8->canonical->encode (
3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3751 );
3752}
3753
3754sub reload_materials {
3755 _reload_materials;
3512} 3756}
3513 3757
3514sub reload_regions { 3758sub reload_regions {
3515 # HACK to clear player env face cache, we need some signal framework 3759 # HACK to clear player env face cache, we need some signal framework
3516 # for this (global event?) 3760 # for this (global event?)
3524 if exists $_->{match}; 3768 if exists $_->{match};
3525 } 3769 }
3526} 3770}
3527 3771
3528sub reload_facedata { 3772sub reload_facedata {
3529 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3530 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3531} 3775}
3532 3776
3533sub reload_archetypes { 3777sub reload_archetypes {
3534 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3535 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3780
3781 cf::face::set
3782 "res/skill_info" => FT_RSRC,
3783 JSON::XS->new->utf8->canonical->encode (
3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3785 );
3786
3787 cf::face::set
3788 "res/spell_paths" => FT_RSRC,
3789 JSON::XS->new->utf8->canonical->encode (
3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3536} 3806}
3537 3807
3538sub reload_treasures { 3808sub reload_treasures {
3539 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3540 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";
3541} 3811}
3542 3812
3543sub reload_sound { 3813sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n"; 3814 trace "loading sound config from $DATADIR/sound\n";
3545 3815
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3816 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3550 3817
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3818 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_] 3819 my $sound = $soundconf->{compat}[$_]
3553 or next; 3820 or next;
3554 3821
3564} 3831}
3565 3832
3566sub reload_resources { 3833sub reload_resources {
3567 trace "reloading resource files...\n"; 3834 trace "reloading resource files...\n";
3568 3835
3569 reload_exp_table;
3570 reload_materials; 3836 reload_materials;
3571 reload_facedata; 3837 reload_facedata;
3838 reload_exp_table;
3572 reload_sound; 3839 reload_sound;
3573 reload_archetypes; 3840 reload_archetypes;
3574 reload_regions; 3841 reload_regions;
3575 reload_treasures; 3842 reload_treasures;
3576 3843
3578} 3845}
3579 3846
3580sub reload_config { 3847sub reload_config {
3581 trace "reloading config file...\n"; 3848 trace "reloading config file...\n";
3582 3849
3583 0 < aio_load "$CONFDIR/config", my $config 3850 my $config = load_file "$CONFDIR/config";
3584 or die "$CONFDIR/config: $!";
3585
3586 utf8::decode $config; 3851 utf8::decode $config;
3587 *CFG = yaml_load $config; 3852 *CFG = decode_yaml $config;
3588 3853
3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3854 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590 3855
3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3856 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3857 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3630 3895
3631sub main { 3896sub main {
3632 cf::init_globals; # initialise logging 3897 cf::init_globals; # initialise logging
3633 3898
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3899 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3900 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3901 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3902 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638 3903
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3904 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640 3905
3641 # we must not ever block the main coroutine 3906 # we must not ever block the main coroutine
3642 local $Coro::idle = sub { 3907 $Coro::idle = sub {
3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3908 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3644 (async { 3909 (async {
3645 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3910 $Coro::current->{desc} = "IDLE BUG HANDLER";
3646 EV::loop EV::LOOP_ONESHOT; 3911 EV::loop EV::LOOP_ONESHOT;
3647 })->prio (Coro::PRIO_MAX); 3912 })->prio (Coro::PRIO_MAX);
3650 evthread_start IO::AIO::poll_fileno; 3915 evthread_start IO::AIO::poll_fileno;
3651 3916
3652 cf::sync_job { 3917 cf::sync_job {
3653 cf::incloader::init (); 3918 cf::incloader::init ();
3654 3919
3920 db_init;
3921
3655 cf::init_anim; 3922 cf::init_anim;
3656 cf::init_attackmess; 3923 cf::init_attackmess;
3657 cf::init_dynamic; 3924 cf::init_dynamic;
3658 3925
3659 cf::load_settings; 3926 cf::load_settings;
3660 3927
3661 reload_resources; 3928 reload_resources;
3662 reload_config; 3929 reload_config;
3663 db_init;
3664 3930
3665 cf::init_uuid; 3931 cf::init_uuid;
3666 cf::init_signals; 3932 cf::init_signals;
3667 cf::init_skills; 3933 cf::init_skills;
3668 3934
3682 }; 3948 };
3683 3949
3684 cf::object::thawer::errors_are_fatal 0; 3950 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n"; 3951 info "parse errors in files are no longer fatal from this point on.\n";
3686 3952
3687 my $free_main; $free_main = EV::idle sub { 3953 AE::postpone {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :) 3954 undef &main; # free gobs of memory :)
3690 }; 3955 };
3691 3956
3692 goto &main_loop; 3957 goto &main_loop;
3693} 3958}
3850 4115
3851 cf::write_runtime_sync; # external watchdog should not bark 4116 cf::write_runtime_sync; # external watchdog should not bark
3852 4117
3853 trace "emergency_perl_save: flushing outstanding aio requests"; 4118 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) { 4119 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4120 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3856 } 4121 }
3857 4122
3858 cf::write_runtime_sync; # external watchdog should not bark 4123 cf::write_runtime_sync; # external watchdog should not bark
3859 }; 4124 };
3860 4125
4041 4306
4042############################################################################# 4307#############################################################################
4043 4308
4044my $bug_warning = 0; 4309my $bug_warning = 0;
4045 4310
4046our @WAIT_FOR_TICK;
4047our @WAIT_FOR_TICK_BEGIN;
4048
4049sub wait_for_tick() { 4311sub wait_for_tick() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4312 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4313
4052 my $signal = new Coro::Signal; 4314 $WAIT_FOR_TICK->wait;
4053 push @WAIT_FOR_TICK, $signal;
4054 $signal->wait;
4055} 4315}
4056 4316
4057sub wait_for_tick_begin() { 4317sub wait_for_tick_begin() {
4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4318 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4059 4319
4060 my $signal = new Coro::Signal; 4320 my $signal = new Coro::Signal;
4061 push @WAIT_FOR_TICK_BEGIN, $signal; 4321 push @WAIT_FOR_TICK_BEGIN, $signal;
4062 $signal->wait; 4322 $signal->wait;
4063} 4323}
4067 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4068 unless ++$bug_warning > 10; 4328 unless ++$bug_warning > 10;
4069 return; 4329 return;
4070 } 4330 }
4071 4331
4072 cf::server_tick; # one server iteration 4332 cf::one_tick; # one server iteration
4073 4333
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4334 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075 4335
4076 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4336 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4337 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4083 } 4343 }
4084 4344
4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4345 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4086 $sig->send; 4346 $sig->send;
4087 } 4347 }
4088 while (my $sig = shift @WAIT_FOR_TICK) { 4348 $WAIT_FOR_TICK->broadcast;
4089 $sig->send;
4090 }
4091 4349
4092 $LOAD = ($NOW - $TICK_START) / $TICK; 4350 $LOAD = ($NOW - $TICK_START) / $TICK;
4093 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4094 4352
4095 if (0) { 4353 if (0) {
4101 } 4359 }
4102} 4360}
4103 4361
4104{ 4362{
4105 # configure BDB 4363 # configure BDB
4364 info "initialising database";
4106 4365
4107 BDB::min_parallel 16; 4366 BDB::min_parallel 16;
4108 BDB::max_poll_reqs $TICK * 0.1; 4367 BDB::max_poll_reqs $TICK * 0.1;
4109 $AnyEvent::BDB::WATCHER->priority (1); 4368 #$AnyEvent::BDB::WATCHER->priority (1);
4110 4369
4111 unless ($DB_ENV) { 4370 unless ($DB_ENV) {
4112 $DB_ENV = BDB::db_env_create; 4371 $DB_ENV = BDB::db_env_create;
4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4373 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4139 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4398 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4140 }; 4399 };
4141 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4400 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4142 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4401 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4143 }; 4402 };
4403
4404 info "database initialised";
4144} 4405}
4145 4406
4146{ 4407{
4147 # configure IO::AIO 4408 # configure IO::AIO
4148 4409
4410 info "initialising aio";
4149 IO::AIO::min_parallel 8; 4411 IO::AIO::min_parallel 8;
4150 IO::AIO::max_poll_time $TICK * 0.1; 4412 IO::AIO::max_poll_time $TICK * 0.1;
4151 undef $AnyEvent::AIO::WATCHER; 4413 undef $AnyEvent::AIO::WATCHER;
4414 info "aio initialised";
4152} 4415}
4153 4416
4154our $_log_backtrace; 4417our $_log_backtrace;
4155our $_log_backtrace_last; 4418our $_log_backtrace_last;
4156 4419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines