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.558 by root, Tue Oct 5 22:35:30 2010 UTC vs.
Revision 1.616 by root, Mon Aug 10 03:05:30 2015 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 }
576 687
577 while ($busy) { 688 while ($busy) {
578 if (Coro::nready) { 689 if (Coro::nready) {
579 Coro::cede_notself; 690 Coro::cede_notself;
580 } else { 691 } else {
581 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONESHOT;
582 } 693 }
583 } 694 }
584 695
585 my $time = AE::time - $time; 696 my $time = AE::time - $time;
586 697
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
1780} 1938}
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
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 1943
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
1949 2095
1950 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1951 () 2097 ()
1952} 2098}
1953 2099
2100# may re-bless or do other evil things
1954sub init { 2101sub init {
1955 my ($self) = @_; 2102 my ($self) = @_;
1956 2103
1957 $self 2104 $self
1958} 2105}
2023 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
2024 2171
2025 1 2172 1
2026} 2173}
2027 2174
2175# used to laod the header of an original map
2028sub load_header_orig { 2176sub load_header_orig {
2029 my ($self) = @_; 2177 my ($self) = @_;
2030 2178
2031 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
2032} 2180}
2033 2181
2182# used to laod the header of an instantiated map
2034sub load_header_temp { 2183sub load_header_temp {
2035 my ($self) = @_; 2184 my ($self) = @_;
2036 2185
2037 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2038} 2187}
2039 2188
2189# called after loading the header from an instantiated map
2040sub prepare_temp { 2190sub prepare_temp {
2041 my ($self) = @_; 2191 my ($self) = @_;
2042 2192
2043 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2044 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2045 # safety 2195 # safety
2046 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2047 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2048} 2198}
2049 2199
2200# called after loading the header from an original map
2050sub prepare_orig { 2201sub prepare_orig {
2051 my ($self) = @_; 2202 my ($self) = @_;
2052 2203
2053 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2054 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2080sub find { 2231sub find {
2081 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2082 2233
2083 cf::cede_to_tick; 2234 cf::cede_to_tick;
2084 2235
2085 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2086 2237
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2089 2240
2090 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2121 2272
2122 { 2273 {
2123 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2124 2275
2125 return unless $self->valid; 2276 return unless $self->valid;
2126 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2127
2128 $self->in_memory (cf::MAP_LOADING);
2129 2278
2130 $self->alloc; 2279 $self->alloc;
2131 2280
2132 $self->pre_load; 2281 $self->pre_load;
2133 cf::cede_to_tick; 2282 cf::cede_to_tick;
2134 2283
2284 if (exists $self->{load_path}) {
2135 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block; 2286 $f->skip_block;
2137 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2138 or return; 2288 or return;
2139 2289
2140 $self->post_load_original 2290 $self->post_load_original
2141 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2142 2292
2143 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2144 utf8::encode $uniq; 2294 utf8::encode $uniq;
2145 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2147 $self->clear_unique_items; 2297 $self->clear_unique_items;
2148 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2150 } 2301 }
2151 } 2302 }
2152 }
2153 2303
2154 $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);
2155 2311
2156 cf::cede_to_tick; 2312 cf::cede_to_tick;
2157 # now do the right thing for maps 2313 # now do the right thing for maps
2158 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2159 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2163 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2164 $self->decay_objects; 2320 $self->decay_objects;
2165 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2166 $self->update_buttons; 2322 $self->update_buttons;
2167 cf::cede_to_tick; 2323 cf::cede_to_tick;
2168 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2169 } 2325 }
2170 2326
2171 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2173
2174 $self->in_memory (cf::MAP_ACTIVE);
2175 } 2329 }
2176 2330
2177 $self->post_load; 2331 $self->post_load;
2178 2332
2179 1 2333 1
2192# if $self->per_party; 2346# if $self->per_party;
2193 2347
2194 $self 2348 $self
2195} 2349}
2196 2350
2197# find and load all maps in the 3x3 area around a map
2198sub load_neighbours {
2199 my ($map) = @_;
2200
2201 my @neigh; # diagonal neighbours
2202
2203 for (0 .. 3) {
2204 my $neigh = $map->tile_path ($_)
2205 or next;
2206 $neigh = find $neigh, $map
2207 or next;
2208 $neigh->load;
2209
2210 # now find the diagonal neighbours
2211 push @neigh,
2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2214 }
2215
2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
2218 my $neigh = find $path, $origin
2219 or next;
2220 $neigh->load;
2221 }
2222}
2223
2224sub find_sync { 2351sub find_sync {
2225 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2226 2353
2354 # it's a bug to call this from the main context
2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main; 2356 if $Coro::current == $Coro::main;
2229 2357
2230 find $path, $origin 2358 find $path, $origin
2231} 2359}
2232 2360
2233sub do_load_sync { 2361sub do_load_sync {
2234 my ($map) = @_; 2362 my ($map) = @_;
2235 2363
2364 # it's a bug to call this from the main context
2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2238 2367
2239 $map->load; 2368 $map->load;
2240} 2369}
2243our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2244 2373
2245sub find_async { 2374sub find_async {
2246 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2247 2376
2248 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2249 2378
2250 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2252 } 2381 }
2253 2382
2254 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2255 2384
2256 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2315sub swap_out { 2444sub swap_out {
2316 my ($self) = @_; 2445 my ($self) = @_;
2317 2446
2318 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2319 2448
2320 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2321 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2322 return if $self->players; 2451 return if $self->players;
2323 2452
2324 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate; 2454 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2328 2457
2329 # then atomically save 2458 # then atomically save
2330 $self->_save; 2459 $self->_save;
2331 2460
2332 # then free the map 2461 # then free the map
2358 2487
2359 return if $self->players; 2488 return if $self->players;
2360 2489
2361 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2362 2491
2363 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2364 2493
2365 # need to save uniques path 2494 # need to save uniques path
2366 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368 2497
2521 2650
2522Creates 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.
2523 2652
2524=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2525 2654
2526returns 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,
2527even if the object actually exists. May block. 2656even if the object actually exists. May block.
2528 2657
2529=cut 2658=cut
2530 2659
2531sub deref { 2660sub deref {
2613=item $player_object->may ("access") 2742=item $player_object->may ("access")
2614 2743
2615Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2616(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2617 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2618=cut 2772=cut
2619 2773
2620sub cf::object::player::may { 2774sub cf::object::player::may {
2621 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2622 2776
2623 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2624 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2625 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2626 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2627} 2781}
2628 2782
2629=item $player_object->enter_link 2783=item $player_object->enter_link
2630 2784
2633The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2634for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2636map. 2790map.
2637 2791
2638Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2639 2799
2640=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2641 2801
2642Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2643map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2698 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2699 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2700 if $x <= 0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2701 2861
2702 $map->load; 2862 $map->load;
2703 $map->load_neighbours;
2704 2863
2705 return unless $self->contr->active; 2864 return unless $self->contr->active;
2706 2865
2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708 if ($self->enter_map ($map, $x, $y)) { 2867 if ($self->enter_map ($map, $x, $y)) {
2764 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2765 } 2924 }
2766 } 2925 }
2767 2926
2768 my $map = eval { 2927 my $map = eval {
2769 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770 2929
2771 if ($map) { 2930 if ($map) {
2772 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2773 $map = $check->($map, $x, $y, $self) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2774 } else { 2933 } else {
2864 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2865 3024
2866 unless (eval { 3025 unless (eval {
2867 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2868 3027
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2878 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp; 3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
2880 3054
2881 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2882 3056
2883 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
2899 3073
2900=head3 cf::client 3074=head3 cf::client
2901 3075
2902=over 4 3076=over 4
2903 3077
2904=item $client->send_drawinfo ($text, $flags)
2905
2906Sends a drawinfo packet to the client. Circumvents output buffering so
2907should not be used under normal circumstances.
2908
2909=cut
2910
2911sub cf::client::send_drawinfo {
2912 my ($self, $text, $flags) = @_;
2913
2914 utf8::encode $text;
2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
2919 3079
2920Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required. 3081them as required.
2922 3082
2940 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
2941} 3101}
2942 3102
2943=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2944 3104
2945Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2946client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2947the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2948the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2949 3109
2950=cut 3110=cut
2951 3111
2952# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
3057 id => "death", 3217 id => "death",
3058 title => "Death", 3218 title => "Death",
3059 reply => undef, 3219 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3061 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3062 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3064); 3230);
3065 3231
3066sub cf::client::send_msg { 3232sub cf::client::send_msg {
3109=cut 3275=cut
3110 3276
3111sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3112 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3113 3279
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
3117 push @msg, msgtype => "event_$type";
3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
3138} 3281}
3139 3282
3140=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3141 3284
3142Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
3162 3305
3163 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3164 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3165 3308
3166 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3167} 3349}
3168 3350
3169cf::client->attach ( 3351cf::client->attach (
3170 on_connect => sub { 3352 on_connect => sub {
3171 my ($ns) = @_; 3353 my ($ns) = @_;
3197 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3198 3380
3199 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200 3382
3201 if (ref $msg) { 3383 if (ref $msg) {
3202 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206 3385
3207 my @reply;
3208
3209 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3210 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3211 } 3404 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
3216 } else { 3405 } else {
3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218 } 3407 }
3219 3408
3220 cf::override; 3409 cf::override;
3388=cut 3577=cut
3389 3578
3390############################################################################# 3579#############################################################################
3391# the server's init and main functions 3580# the server's init and main functions
3392 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3393sub load_facedata($) { 3659sub load_facedata($) {
3394 my ($path) = @_; 3660 my ($path) = @_;
3395 3661
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401 3663
3402 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3403 3665
3404 0 < aio_load $path, my $facedata 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3405 or die "$path: $!";
3406
3407 $facedata = Coro::Storable::thaw $facedata;
3408 3667
3409 $facedata->{version} == 2 3668 $facedata->{version} == 2
3410 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3411 3670
3412 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3414 $facedata->{resource}{"res/exp_table"} = { 3673
3415 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3416 data => $exp_table, 3675
3417 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3418 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3419 cf::cede_to_tick; 3678 my $t1 = EV::time;
3420 3679
3421 { 3680 {
3422 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3423 3682
3424 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3425 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426 3686
3427 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3432 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3433 cf::cede_to_tick; 3693 delete $cf::face::META[$idx];
3434 } 3694 }
3435 3695
3436 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3437 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3438 3698
3443 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3445 } else { 3705 } else {
3446 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3447 } 3707 }
3448
3449 cf::cede_to_tick;
3450 } 3708 }
3451 } 3709 }
3452 3710
3453 { 3711 {
3454 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3455 3713
3456 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3457 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3458 cf::cede_to_tick;
3459 } 3716 }
3460 3717
3461 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3462 } 3719 }
3463 3720
3464 { 3721 {
3465 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3466 3723
3467 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3468 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3469 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3470 3728
3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3473 } else { 3735 } else {
3474 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3475 } 3737 }
3476
3477 cf::cede_to_tick;
3478 } 3738 }
3479 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3480 3750
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3482 3754
3483 1 3755 1
3484} 3756}
3485 3757
3486register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3497 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3499 cf::arch::commit_load; 3771 cf::arch::commit_load;
3500 3772
3501 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3502} 3788}
3503 3789
3504sub reload_regions { 3790sub reload_regions {
3505 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3506 # for this (global event?) 3792 # for this (global event?)
3514 if exists $_->{match}; 3800 if exists $_->{match};
3515 } 3801 }
3516} 3802}
3517 3803
3518sub reload_facedata { 3804sub reload_facedata {
3519 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3520 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3521} 3807}
3522 3808
3523sub reload_archetypes { 3809sub reload_archetypes {
3524 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3525 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3526} 3838}
3527 3839
3528sub reload_treasures { 3840sub reload_treasures {
3529 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3530 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3531} 3843}
3532 3844
3533sub reload_sound { 3845sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n"; 3846 trace "loading sound config from $DATADIR/sound\n";
3535 3847
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540 3849
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_] 3851 my $sound = $soundconf->{compat}[$_]
3543 or next; 3852 or next;
3544 3853
3554} 3863}
3555 3864
3556sub reload_resources { 3865sub reload_resources {
3557 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3558 3867
3559 reload_exp_table;
3560 reload_materials; 3868 reload_materials;
3561 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3562 reload_sound; 3871 reload_sound;
3563 reload_archetypes; 3872 reload_archetypes;
3564 reload_regions; 3873 reload_regions;
3565 reload_treasures; 3874 reload_treasures;
3566 3875
3568} 3877}
3569 3878
3570sub reload_config { 3879sub reload_config {
3571 trace "reloading config file...\n"; 3880 trace "reloading config file...\n";
3572 3881
3573 0 < aio_load "$CONFDIR/config", my $config 3882 my $config = load_file "$CONFDIR/config";
3574 or die "$CONFDIR/config: $!";
3575
3576 utf8::decode $config; 3883 utf8::decode $config;
3577 *CFG = yaml_load $config; 3884 *CFG = decode_yaml $config;
3578 3885
3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3580 3887
3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3608 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3609 print $fh $$; 3916 print $fh $$;
3610} 3917}
3611 3918
3612sub main_loop { 3919sub main_loop {
3613 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3614 if (1) { 3921 if (1) {
3615 EV::loop; 3922 EV::run;
3616 } 3923 }
3617 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3619} 3926}
3620 3927
3621sub main { 3928sub main {
3622 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3623 3930
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628 3935
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630 3937
3631 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3632 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3634 (async { 3941 (async {
3635 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONESHOT;
3637 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3638 }; 3945 };
3639 3946
3640 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3641 3948
3642 cf::sync_job { 3949 cf::sync_job {
3643 cf::incloader::init (); 3950 cf::incloader::init ();
3951
3952 db_init;
3644 3953
3645 cf::init_anim; 3954 cf::init_anim;
3646 cf::init_attackmess; 3955 cf::init_attackmess;
3647 cf::init_dynamic; 3956 cf::init_dynamic;
3648 3957
3649 cf::load_settings; 3958 cf::load_settings;
3650 3959
3651 reload_resources; 3960 reload_resources;
3652 reload_config; 3961 reload_config;
3653 db_init;
3654 3962
3655 cf::init_uuid; 3963 cf::init_uuid;
3656 cf::init_signals; 3964 cf::init_signals;
3657 cf::init_skills; 3965 cf::init_skills;
3658 3966
3672 }; 3980 };
3673 3981
3674 cf::object::thawer::errors_are_fatal 0; 3982 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n"; 3983 info "parse errors in files are no longer fatal from this point on.\n";
3676 3984
3677 my $free_main; $free_main = EV::idle sub { 3985 AE::postpone {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :) 3986 undef &main; # free gobs of memory :)
3680 }; 3987 };
3681 3988
3682 goto &main_loop; 3989 goto &main_loop;
3683} 3990}
3840 4147
3841 cf::write_runtime_sync; # external watchdog should not bark 4148 cf::write_runtime_sync; # external watchdog should not bark
3842 4149
3843 trace "emergency_perl_save: flushing outstanding aio requests"; 4150 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) { 4151 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3846 } 4153 }
3847 4154
3848 cf::write_runtime_sync; # external watchdog should not bark 4155 cf::write_runtime_sync; # external watchdog should not bark
3849 }; 4156 };
3850 4157
4031 4338
4032############################################################################# 4339#############################################################################
4033 4340
4034my $bug_warning = 0; 4341my $bug_warning = 0;
4035 4342
4036our @WAIT_FOR_TICK;
4037our @WAIT_FOR_TICK_BEGIN;
4038
4039sub wait_for_tick() { 4343sub wait_for_tick() {
4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4041 4345
4042 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
4043 push @WAIT_FOR_TICK, $signal;
4044 $signal->wait;
4045} 4347}
4046 4348
4047sub wait_for_tick_begin() { 4349sub wait_for_tick_begin() {
4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4049 4351
4050 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
4051 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
4052 $signal->wait; 4354 $signal->wait;
4053} 4355}
4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4058 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
4059 return; 4361 return;
4060 } 4362 }
4061 4363
4062 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4063 4365
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065 4367
4066 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4073 } 4375 }
4074 4376
4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076 $sig->send; 4378 $sig->send;
4077 } 4379 }
4078 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
4079 $sig->send;
4080 }
4081 4381
4082 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084 4384
4085 if (0) { 4385 if (0) {
4091 } 4391 }
4092} 4392}
4093 4393
4094{ 4394{
4095 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4096 4397
4097 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4098 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4099 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4100 4401
4101 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
4102 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 }; 4431 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 }; 4434 };
4435
4436 info "database initialised";
4134} 4437}
4135 4438
4136{ 4439{
4137 # configure IO::AIO 4440 # configure IO::AIO
4138 4441
4442 info "initialising aio";
4139 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4140 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4141 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4142} 4447}
4143 4448
4144our $_log_backtrace; 4449our $_log_backtrace;
4145our $_log_backtrace_last; 4450our $_log_backtrace_last;
4146 4451

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines