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.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 6#
6# Deliantra is free software: you can redistribute it and/or modify it under 7# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 8# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 9# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 10# option) any later version.
10# 11#
11# This program is distributed in the hope that it will be useful, 12# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 15# GNU General Public License for more details.
15# 16#
16# You should have received a copy of the Affero GNU General Public License 17# 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 18# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 19# <http://www.gnu.org/licenses/>.
19# 20#
20# The authors can be reached via e-mail to <support@deliantra.net> 21# The authors can be reached via e-mail to <support@deliantra.net>
21# 22#
22 23
23package cf; 24package cf;
24 25
25use 5.10.0; 26use common::sense;
26use utf8;
27use strict qw(vars subs);
28 27
29use Symbol; 28use Symbol;
30use List::Util; 29use List::Util;
31use Socket; 30use Socket;
32use EV; 31use EV;
34use Safe; 33use Safe;
35use Safe::Hole; 34use Safe::Hole;
36use Storable (); 35use Storable ();
37use Carp (); 36use Carp ();
38 37
39use Guard (); 38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
40use Coro (); 42use Coro ();
41use Coro::State; 43use Coro::State;
42use Coro::Handle; 44use Coro::Handle;
43use Coro::EV; 45use Coro::EV;
44use Coro::AnyEvent; 46use Coro::AnyEvent;
50use Coro::AIO; 52use Coro::AIO;
51use Coro::BDB 1.6; 53use Coro::BDB 1.6;
52use Coro::Storable; 54use Coro::Storable;
53use Coro::Util (); 55use Coro::Util ();
54 56
57use Guard ();
55use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
56use BDB (); 59use BDB ();
57use Data::Dumper; 60use Data::Dumper;
58use Fcntl; 61use Fcntl;
59use YAML::XS (); 62use YAML::XS ();
63use CBOR::XS ();
60use IO::AIO (); 64use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 65use Compress::LZF;
63use Digest::MD5 (); 66use Digest::MD5 ();
64 67
65AnyEvent::detect; 68AnyEvent::detect;
66 69
78# strictly for debugging 81# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 82$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 83
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 84sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 85
86our @ORIG_INC;
87
83our %COMMAND = (); 88our %COMMAND = ();
84our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
85 90
86our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
88our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
91 98
92our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 100our @EVENT;
94our @REFLECT; # set by XS 101our @REFLECT; # set by XS
95our %REFLECT; # set by us 102our %REFLECT; # set by us
96 103
97our $CONFDIR = confdir; 104our $CONFDIR = confdir;
105
98our $DATADIR = datadir; 106our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 107our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 108our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 109our $MAPDIR = "$DATADIR/" . mapdir;
110
102our $LOCALDIR = localdir; 111our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 112our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 113our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 114our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 115our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 116our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 117our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 118our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 119
111our %RESOURCE; # unused 120#our %RESOURCE; # unused
112 121
113our $OUTPUT_RATE_MIN = 3000; 122our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 123our $OUTPUT_RATE_MAX = 1000000;
115 124
116our $MAX_LINKS = 32; # how many chained exits to follow 125our $MAX_LINKS = 32; # how many chained exits to follow
124our $BDB_DEADLOCK_WATCHER; 133our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 134our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 135our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 136our $DB_ENV;
128 137
129our @EXTRA_MODULES = qw(pod match mapscript); 138our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 139
131our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 142
133our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 144our $RUNTIME = 0;
145our $SERVER_TICK = 0;
135our $NOW; 146our $NOW;
136 147
137our (%PLAYER, %PLAYER_LOADING); # all users 148our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 149our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 150our $LINK_MAP; # the special {link} map, which is always available
148 159
149our @POST_INIT; 160our @POST_INIT;
150 161
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 162our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 163our $REALLY_UNLOOP; # never set to true, please :)
164
165our $WAIT_FOR_TICK = new Coro::Signal;
166our @WAIT_FOR_TICK_BEGIN;
153 167
154binmode STDOUT; 168binmode STDOUT;
155binmode STDERR; 169binmode STDERR;
156 170
157# read virtual server time, if available 171# read virtual server time, if available
191 205
192=over 4 206=over 4
193 207
194=item $cf::UPTIME 208=item $cf::UPTIME
195 209
196The timestamp of the server start (so not actually an uptime). 210The timestamp of the server start (so not actually an "uptime").
211
212=item $cf::SERVER_TICK
213
214An unsigned integer that starts at zero when the server is started and is
215incremented on every tick.
216
217=item $cf::NOW
218
219The (real) time of the last (current) server tick - updated before and
220after tick processing, so this is useful only as a rough "what time is it
221now" estimate.
222
223=item $cf::TICK
224
225The interval between each server tick, in seconds.
197 226
198=item $cf::RUNTIME 227=item $cf::RUNTIME
199 228
200The time this server has run, starts at 0 and is increased by $cf::TICK on 229The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 230every server tick.
202 231
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 235
207Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
210database environment. 239database environment.
211 240
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 241=item $cf::LOADAVG
221 242
222The current CPU load on the server (alpha-smoothed), as a value between 0 243The 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 244(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 254from wherever your confdir points to.
234 255
235=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
236 257
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 258These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one process 259cf::wait_for_tick_begin only returns directly I<after> the tick
260processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 261cf::wait_for_tick wakes up all waiters after tick processing.
262
263Note that cf::wait_for_tick will immediately return when the server is not
264ticking, making it suitable for small pauses in threads that need to run
265when the server is paused. If that is not applicable (i.e. you I<really>
266want to wait, use C<$cf::WAIT_FOR_TICK>).
267
268=item $cf::WAIT_FOR_TICK
269
270Note that C<cf::wait_for_tick> is probably the correct thing to use. This
271variable contains a L<Coro::Signal> that is broadcats after every server
272tick. Calling C<< ->wait >> on it will suspend the caller until after the
273next server tick.
274
275=cut
276
277sub wait_for_tick();
278sub wait_for_tick_begin();
240 279
241=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
242 281
243This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 283C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
305)) { 344)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 346}
308 347
309$EV::DIED = sub { 348$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 349 warn "error in event callback: $@";
311}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
312 356
313############################################################################# 357#############################################################################
314 358
315=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
316 360
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 381 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 382 $d
339 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
340} 384}
341 385
386=item $scalar = cf::load_file $path
387
388Loads the given file from path and returns its contents. Croaks on error
389and can block.
390
391=cut
392
393sub load_file($) {
394 0 <= aio_load $_[0], my $data
395 or Carp::croak "$_[0]: $!";
396
397 $data
398}
399
400=item $success = cf::replace_file $path, $data, $sync
401
402Atomically replaces the file at the given $path with new $data, and
403optionally $sync the data to disk before replacing the file.
404
405=cut
406
407sub replace_file($$;$) {
408 my ($path, $data, $sync) = @_;
409
410 my $lock = cf::lock_acquire ("replace_file:$path");
411
412 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
413 or return;
414
415 $data = $data->() if ref $data;
416
417 length $data == aio_write $fh, 0, (length $data), $data, 0
418 or return;
419
420 !$sync
421 or !aio_fsync $fh
422 or return;
423
424 aio_close $fh
425 and return;
426
427 aio_rename "$path~", $path
428 and return;
429
430 if ($sync) {
431 $path =~ s%/[^/]*$%%;
432 aio_pathsync $path;
433 }
434
435 1
436}
437
342=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
343 439
344Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
345 441
346=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 448our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 449
354sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
356 452
453=item $ref = cf::decode_storable $scalar
454
455Same as Coro::Storable::thaw, so blocks.
456
457=cut
458
459BEGIN { *decode_storable = \&Coro::Storable::thaw }
460
461=item $ref = cf::decode_yaml $scalar
462
463Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
464
465=cut
466
467sub decode_yaml($) {
468 fork_call { YAML::XS::Load $_[0] } @_
469}
470
471=item $scalar = cf::decode_cbor $scalar
472
473Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
474blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
475alternative.
476
477=cut
478
479sub decode_cbor($) {
480 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
481 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
482 CBOR::XS::decode_cbor $_[0]
483}
484
485=item $scalar = cf::unlzf $scalar
486
487Same as Compress::LZF::compress, but takes server ticks into account, so
488blocks.
489
490=cut
491
492sub unlzf($) {
493 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
494 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
495 Compress::LZF::decompress $_[0]
496}
497
357=item cf::post_init { BLOCK } 498=item cf::post_init { BLOCK }
358 499
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 500Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 501but I<before> the server starts ticking again.
361 502
362The cdoeblock will have a single boolean argument to indicate whether this 503The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 504is a reload or not.
364 505
365=cut 506=cut
366 507
367sub post_init(&) { 508sub post_init(&) {
368 push @POST_INIT, shift; 509 push @POST_INIT, shift;
369} 510}
370 511
512sub _post_init {
513 trace "running post_init jobs";
514
515 # run them in parallel...
516
517 my @join;
518
519 while () {
520 push @join, map &Coro::async ($_, 0), @POST_INIT;
521 @POST_INIT = ();
522
523 @join or last;
524
525 (pop @join)->join;
526 }
527}
528
371=item cf::lock_wait $string 529=item cf::lock_wait $string
372 530
373Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
374 532
375=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
376 534
377Wait until the given lock is available and then acquires it and returns 535Wait until the given lock is available and then acquires it and returns
378a L<Guard> object. If the guard object gets destroyed (goes out of scope, 536a L<Guard> object. If the guard object gets destroyed (goes out of scope,
426 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
427} 585}
428 586
429=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
430 588
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 590(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 591C<$time> seconds of cpu time till the next tick. The slot is only valid
592till the next cede.
593
594Background jobs should use a priority less than zero, interactive jobs
595should use 100 or more.
434 596
435The optional C<$name> can be used to identify the job to run. It might be 597The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
437 599
438Useful for short background jobs. 600Useful for short background jobs.
450 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
451 my $busy; 613 my $busy;
452 614
453 while () { 615 while () {
454 next_job: 616 next_job:
617
618 Coro::cede;
455 619
456 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
457 621
458 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
459 if ($SLOT_QUEUE[$_][0] <= $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0; 624 $busy = 0;
461 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
462 $job->[2]->send; 626 $job->[2]->send;
463 Coro::cede;
464 goto next_job; 627 goto next_job;
465 } else { 628 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467 } 630 }
468 } 631 }
469 632
470 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
472 push @cf::WAIT_FOR_TICK, $signal;
473 $signal->wait;
474 } else { 635 } else {
475 $busy = 0; 636 $busy = 0;
476 Coro::schedule; 637 Coro::schedule;
477 } 638 }
478 } 639 }
504BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
505 666
506=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
507 668
508The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
509is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 671partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
511acceptable. 672acceptable.
512 673
513If it must be done, put the blocking parts into C<sync_job>. This will run 674If it must be done, put the blocking parts into C<sync_job>. This will run
514the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
518=cut 679=cut
519 680
520sub sync_job(&) { 681sub sync_job(&) {
521 my ($job) = @_; 682 my ($job) = @_;
522 683
523 if ($Coro::current == $Coro::main) { 684 if (in_main) {
524 my $time = AE::time; 685 my $time = AE::time;
525 686
526 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
527 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
528 689
529 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
530 691
531 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
532 693
533 my $busy = 1; 694 my $busy = 1;
534 my @res; 695 my @res;
542 703
543 while ($busy) { 704 while ($busy) {
544 if (Coro::nready) { 705 if (Coro::nready) {
545 Coro::cede_notself; 706 Coro::cede_notself;
546 } else { 707 } else {
547 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
548 } 709 }
549 } 710 }
550 711
551 my $time = AE::time - $time; 712 my $time = AE::time - $time;
552 713
578 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
579 740
580 $coro 741 $coro
581} 742}
582 743
583=item fork_call { }, $args 744=item fork_call { }, @args
584 745
585Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 749never block itself or use any form of event handling.
589 750
590=cut 751=cut
591 752
753sub post_fork {
754 reset_signals;
755}
756
592sub fork_call(&@) { 757sub fork_call(&@) {
593 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
594 759
595 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious)
598
599 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
600 reset_signals; 761 cf::post_fork;
601 &$cb 762 &$cb
602 }, @args; 763 } @args;
603 764
604 wantarray ? @res : $res[-1] 765 wantarray ? @res : $res[-1]
605} 766}
606 767
607sub objinfo { 768sub objinfo {
657within each server. 818within each server.
658 819
659=cut 820=cut
660 821
661sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
662 my ($name) = @_; 826 my ($name) = @_;
663 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
664 828
665 eval { 829 eval {
666 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
676} 840}
677 841
678our $DB; 842our $DB;
679 843
680sub db_init { 844sub db_init {
681 cf::sync_job {
682 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
683 };
684} 846}
685 847
686sub db_get($$) { 848sub db_get($$) {
687 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
688 850
689 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
690 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
691 855
692 $! ? () 856 $! ? ()
693 : $data 857 : $data
694 }
695} 858}
696 859
697sub db_put($$$) { 860sub db_put($$$) {
698 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
727 890
728 my @data; 891 my @data;
729 my $md5; 892 my $md5;
730 893
731 for (0 .. $#$src) { 894 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 896 }
735 897
736 # if processing is expensive, check 898 # if processing is expensive, check
737 # checksum first 899 # checksum first
738 if (1) { 900 if (1) {
751 913
752 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
753 } 915 }
754 } 916 }
755 917
756 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
757 my $data = $process->(\@data); 919 my $data = $process->(\@data);
758 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
759 921
760 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
761 923
762 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
763 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
1283=cut 1445=cut
1284 1446
1285############################################################################# 1447#############################################################################
1286# command handling &c 1448# command handling &c
1287 1449
1288=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1289 1451
1290Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1291$name. 1453$name.
1292 1454
1293=cut 1455=cut
1299 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1300 1462
1301 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1302} 1464}
1303 1465
1304=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1305 1467
1306Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1307extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1308received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1309the logged-in player. Ext commands can only be processed after a player 1471the logged-in player. Ext commands can only be processed after a player
1310has logged in successfully. 1472has logged in successfully.
1311 1473
1312If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1313called.
1314 1475
1476=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1477
1478Same as C<cf::register_extcmd>, but instead of returning values, the
1479callback needs to clal the C<$reply> function.
1480
1315=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1316 1482
1317Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1318exticmd packet. Exti commands are processed by the server as soon as they 1484exticmd packet. Exti commands are processed by the server as soon as they
1319are received, i.e. out of order w.r.t. other commands. The first argument 1485are received, i.e. out of order w.r.t. other commands. The first argument
1320is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1321log-in. 1487log-in.
1322 1488
1323If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1324called.
1325 1490
1326=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1327 1492
1493Same as C<cf::register_extcmd>, but instead of returning values, the
1494callback needs to clal the C<$reply> function.
1495
1496=cut
1497
1328sub register_extcmd { 1498sub register_extcmd($$) {
1329 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1330 1500
1331 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1332} 1502}
1333 1503
1334sub register_exticmd { 1504sub register_async_extcmd($$) {
1335 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1336 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1337 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1514}
1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1338} 1520}
1339 1521
1340use File::Glob (); 1522use File::Glob ();
1341 1523
1342cf::player->attach ( 1524cf::player->attach (
1356 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1357 1539
1358 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359 1541
1360 if (ref $msg) { 1542 if (ref $msg) {
1361 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362 "ARRAY" eq ref $msg
1363 ? @$msg
1364 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365 1544
1366 my @reply;
1367
1368 if (my $cb = $EXTCMD{$type}) { 1545 if (my $cb = $EXTACMD{$type}) {
1546 $cb->(
1547 $pl,
1548 sub {
1549 $pl->ext_msg ("reply-$reply", @_)
1550 if $reply;
1551 },
1552 @payload
1553 );
1554 } else {
1555 my @reply;
1556
1557 if (my $cb = $EXTCMD{$type}) {
1369 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1370 } 1563 }
1371
1372 $pl->ext_reply ($reply, @reply)
1373 if $reply;
1374 1564
1375 } else { 1565 } else {
1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1377 } 1567 }
1378 1568
1391 }; 1581 };
1392 1582
1393 $grp 1583 $grp
1394} 1584}
1395 1585
1586sub _ext_cfg_reg($$$$) {
1587 my ($rvar, $varname, $cfgname, $default) = @_;
1588
1589 $cfgname = lc $varname
1590 unless length $cfgname;
1591
1592 $EXT_CFG{$cfgname} = [$rvar, $default];
1593
1594 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1595}
1596
1396sub load_extensions { 1597sub load_extensions {
1397 info "loading extensions..."; 1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1398 1601
1399 cf::sync_job { 1602 cf::sync_job {
1400 my %todo; 1603 my %todo;
1401 1604
1402 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1421 1624
1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424 1627
1425 $ext{source} = 1628 $ext{source} =
1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1427 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1428 . $source 1631 . $source
1429 . "\n};\n1"; 1632 . "\n};\n1";
1430 1633
1431 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1445 unless exists $done{$_}; 1648 unless exists $done{$_};
1446 } 1649 }
1447 1650
1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449 1652
1653 my $source = $v->{source};
1654
1655 # support "CONF varname :confname = default" pseudo-statements
1656 $source =~ s{
1657 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1658 }{
1659 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1660 }gmxe;
1661
1450 my $active = eval $v->{source}; 1662 my $active = eval $source;
1451 1663
1452 if (length $@) { 1664 if (length $@) {
1453 error "$v->{path}: $@\n"; 1665 error "$v->{path}: $@\n";
1454 1666
1455 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1472 1684
1473 while (my ($k, $v) = each %todo) { 1685 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1686 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory}; 1687 if exists $v->{meta}{mandatory};
1476 } 1688 }
1689
1690 last;
1477 } 1691 }
1478 } 1692 }
1479 }; 1693 };
1480} 1694}
1481 1695
1639 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1640 1854
1641 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1856 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1643 1857
1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645 $pl->deactivate; 1859 $pl->deactivate;
1860
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1861 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1648 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1649 1866
1650 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1651 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1652 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1738 1955
1739=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1740 1957
1741Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1742 1959
1743=item $player->ext_reply ($msgid, @msg)
1744
1745Sends an ext reply to the player.
1746
1747=cut
1748
1749sub ext_reply($$@) {
1750 my ($self, $id, @msg) = @_;
1751
1752 $self->ns->ext_reply ($id, @msg)
1753}
1754
1755=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1756 1961
1757Sends an ext event to the client. 1962Sends an ext event to the client.
1758 1963
1759=cut 1964=cut
1818sub generate_random_map { 2023sub generate_random_map {
1819 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1820 2025
1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2026 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822 2027
1823 # mit "rum" bekleckern, nicht
1824 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828 $rmp->{exit_on_final_map},
1829 $rmp->{xsize}, $rmp->{ysize},
1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835 (cf::region::find $rmp->{region}), $rmp->{custom}
1836 )
1837} 2029}
1838 2030
1839=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1840 2032
1841Register a handler for the map path matching the given regex at the 2033Register a handler for the map path matching the given regex at the
1846 2038
1847sub register { 2039sub register {
1848 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1849 my $pkg = caller; 2041 my $pkg = caller;
1850 2042
1851 no strict;
1852 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1853 2044
1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855} 2046}
1856 2047
1868} 2059}
1869 2060
1870sub normalise { 2061sub normalise {
1871 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1872 2063
1873 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1874 2065
1875 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1876 2067
1877 # map plan: 2068 # map plan:
1878 # 2069 #
1893 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 2085 $path = "$base/$path";
1895 } 2086 }
1896 2087
1897 for ($path) { 2088 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1901 } 2091 }
1902 2092
1903 $path 2093 $path
1917 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1918 return $self; 2108 return $self;
1919 } 2109 }
1920 } 2110 }
1921 2111
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 2113 ()
1924} 2114}
1925 2115
2116# may re-bless or do other evil things
1926sub init { 2117sub init {
1927 my ($self) = @_; 2118 my ($self) = @_;
1928 2119
1929 $self 2120 $self
1930} 2121}
1995 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1996 2187
1997 1 2188 1
1998} 2189}
1999 2190
2191# used to laod the header of an original map
2000sub load_header_orig { 2192sub load_header_orig {
2001 my ($self) = @_; 2193 my ($self) = @_;
2002 2194
2003 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
2004} 2196}
2005 2197
2198# used to laod the header of an instantiated map
2006sub load_header_temp { 2199sub load_header_temp {
2007 my ($self) = @_; 2200 my ($self) = @_;
2008 2201
2009 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
2010} 2203}
2011 2204
2205# called after loading the header from an instantiated map
2012sub prepare_temp { 2206sub prepare_temp {
2013 my ($self) = @_; 2207 my ($self) = @_;
2014 2208
2015 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
2016 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
2017 # safety 2211 # safety
2018 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
2019 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
2020} 2214}
2021 2215
2216# called after loading the header from an original map
2022sub prepare_orig { 2217sub prepare_orig {
2023 my ($self) = @_; 2218 my ($self) = @_;
2024 2219
2025 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
2026 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
2050 2245
2051sub find; 2246sub find;
2052sub find { 2247sub find {
2053 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
2054 2249
2250 cf::cede_to_tick;
2251
2055 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
2056 2253
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
2059 2256
2060 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
2091 2288
2092 { 2289 {
2093 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
2094 2291
2095 return unless $self->valid; 2292 return unless $self->valid;
2096 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2097
2098 $self->in_memory (cf::MAP_LOADING);
2099 2294
2100 $self->alloc; 2295 $self->alloc;
2101 2296
2102 $self->pre_load; 2297 $self->pre_load;
2103 cf::cede_to_tick; 2298 cf::cede_to_tick;
2104 2299
2300 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2302 $f->skip_block;
2107 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2108 or return; 2304 or return;
2109 2305
2110 $self->post_load_original 2306 $self->post_load_original
2111 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2112 2308
2113 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2310 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2313 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2120 } 2317 }
2121 } 2318 }
2122 }
2123 2319
2124 $f->resolve_delayed_derefs; 2320 $f->resolve_delayed_derefs;
2321 } else {
2322 $self->post_load_original
2323 if delete $self->{load_original};
2324 }
2325
2326 $self->state (cf::MAP_INACTIVE);
2125 2327
2126 cf::cede_to_tick; 2328 cf::cede_to_tick;
2127 # now do the right thing for maps 2329 # now do the right thing for maps
2128 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2133 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2134 $self->decay_objects; 2336 $self->decay_objects;
2135 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2136 $self->update_buttons; 2338 $self->update_buttons;
2137 cf::cede_to_tick; 2339 cf::cede_to_tick;
2138 $self->activate; 2340 #$self->activate; # no longer activate maps automatically
2139 } 2341 }
2140 2342
2141 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2142 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2143
2144 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2345 }
2146 2346
2147 $self->post_load; 2347 $self->post_load;
2348
2349 1
2148} 2350}
2149 2351
2150# customize the map for a given player, i.e. 2352# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2353# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2354# maps to change the path to ~playername/mappath
2160# if $self->per_party; 2362# if $self->per_party;
2161 2363
2162 $self 2364 $self
2163} 2365}
2164 2366
2165# find and load all maps in the 3x3 area around a map
2166sub load_neighbours {
2167 my ($map) = @_;
2168
2169 my @neigh; # diagonal neighbours
2170
2171 for (0 .. 3) {
2172 my $neigh = $map->tile_path ($_)
2173 or next;
2174 $neigh = find $neigh, $map
2175 or next;
2176 $neigh->load;
2177
2178 # now find the diagonal neighbours
2179 push @neigh,
2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2182 }
2183
2184 for (grep defined $_->[0], @neigh) {
2185 my ($path, $origin) = @$_;
2186 my $neigh = find $path, $origin
2187 or next;
2188 $neigh->load;
2189 }
2190}
2191
2192sub find_sync { 2367sub find_sync {
2193 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2194 2369
2195 cf::sync_job { find $path, $origin } 2370 # it's a bug to call this from the main context
2371 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2372 if $Coro::current == $Coro::main;
2373
2374 find $path, $origin
2196} 2375}
2197 2376
2198sub do_load_sync { 2377sub do_load_sync {
2199 my ($map) = @_; 2378 my ($map) = @_;
2200 2379
2380 # it's a bug to call this from the main context
2201 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2203 2383
2204 cf::sync_job { $map->load }; 2384 $map->load;
2205} 2385}
2206 2386
2207our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2208our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2209 2389
2210sub find_async { 2390sub find_async {
2211 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2212 2392
2213 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2214 2394
2215 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2216 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2396 return $map if !$load || $map->linkable;
2217 } 2397 }
2218 2398
2219 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2220 2400
2221 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2222 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2223 2403
2224 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2225 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2226 if (my $map = find $k) { 2406 if (my $map = find $k) {
2227 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2228 } 2408 }
2229 2409
2230 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2231 } 2411 }
2232 } 2412 }
2280sub swap_out { 2460sub swap_out {
2281 my ($self) = @_; 2461 my ($self) = @_;
2282 2462
2283 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284 2464
2285 return if $self->in_memory != cf::MAP_ACTIVE; 2465 return if !$self->linkable;
2286 return if $self->{deny_save}; 2466 return if $self->{deny_save};
2287 return if $self->players; 2467 return if $self->players;
2288 2468
2289 # first deactivate the map and "unlink" it from the core 2469 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate; 2470 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP; 2471 $_->clear_links_to ($self) for values %cf::MAP;
2292 $self->in_memory (cf::MAP_SWAPPED); 2472 $self->state (cf::MAP_SWAPPED);
2293 2473
2294 # then atomically save 2474 # then atomically save
2295 $self->_save; 2475 $self->_save;
2296 2476
2297 # then free the map 2477 # then free the map
2323 2503
2324 return if $self->players; 2504 return if $self->players;
2325 2505
2326 cf::trace "resetting map ", $self->path, "\n"; 2506 cf::trace "resetting map ", $self->path, "\n";
2327 2507
2328 $self->in_memory (cf::MAP_SWAPPED); 2508 $self->state (cf::MAP_SWAPPED);
2329 2509
2330 # need to save uniques path 2510 # need to save uniques path
2331 unless ($self->{deny_save}) { 2511 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq; 2512 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333 2513
2486 2666
2487Creates and returns a persistent reference to an object that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2488 2668
2489=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2490 2670
2491returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2671returns the objetc referenced by refstring. may return undef when it cannot find the object,
2492even if the object actually exists. May block. 2672even if the object actually exists. May block.
2493 2673
2494=cut 2674=cut
2495 2675
2496sub deref { 2676sub deref {
2578=item $player_object->may ("access") 2758=item $player_object->may ("access")
2579 2759
2580Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2581(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2582 2762
2763This is implemented by checking a config setting of C<may_access> where
2764C<access> is replaced by the access string. The following alternatives are
2765possible (and are tested in order):
2766
2767=over 4
2768
2769=item * Player is DM
2770
2771The request will succeed.
2772
2773=item * may_access is an array reference
2774
2775If either the player nickname or UUID is in the array, the request will
2776succeed, otherwise it will fail.
2777
2778=item * may_access is a true value
2779
2780The request will succeed.
2781
2782=item * may_access is missing or false
2783
2784The request will fail.
2785
2786=back
2787
2583=cut 2788=cut
2584 2789
2585sub cf::object::player::may { 2790sub cf::object::player::may {
2586 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2587 2792
2588 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2589 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2590 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2591 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2592} 2797}
2593 2798
2594=item $player_object->enter_link 2799=item $player_object->enter_link
2595 2800
2598The player should be reasonably safe there for short amounts of time (e.g. 2803The player should be reasonably safe there for short amounts of time (e.g.
2599for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2804for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link 2805though, as the player cannot control the character while it is on the link
2601map. 2806map.
2602 2807
2603Will never block. 2808This method will never block, which is the whole reaosn for it's
2809existance: you can I<always> put a player onto the link map, which is the
2810only place to put objects that is guaranteed to exist.
2811
2812A typical usage pattern is to call C<enter_link> synchronously from the
2813server, then start a new thread, do your blocking stuff there and then
2814call C<leave_link> from that thread.
2604 2815
2605=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2606 2817
2607Moves the player out of the special C<{link}> map onto the specified 2818Moves the player out of the special C<{link}> map onto the specified
2608map. If the map is not valid (or omitted), the player will be moved back 2819map. If the map is not valid (or omitted), the player will be moved back
2663 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2664 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2665 if $x <= 0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2666 2877
2667 $map->load; 2878 $map->load;
2668 $map->load_neighbours;
2669 2879
2670 return unless $self->contr->active; 2880 return unless $self->contr->active;
2671 2881
2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2673 if ($self->enter_map ($map, $x, $y)) { 2883 if ($self->enter_map ($map, $x, $y)) {
2729 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2730 } 2940 }
2731 } 2941 }
2732 2942
2733 my $map = eval { 2943 my $map = eval {
2734 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735 2945
2736 if ($map) { 2946 if ($map) {
2737 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2738 $map = $check->($map, $x, $y, $self) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2739 } else { 2949 } else {
2829 $Coro::current->{desc} = "enter_exit"; 3039 $Coro::current->{desc} = "enter_exit";
2830 3040
2831 unless (eval { 3041 unless (eval {
2832 $self->deactivate_recursive; # just to be sure 3042 $self->deactivate_recursive; # just to be sure
2833 3043
2834 # random map handling
2835 {
2836 my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838 prepare_random_map $exit
2839 if $exit->slaying eq "/!";
2840 }
2841
2842 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3044 my $map = cf::map::normalise $exit->slaying, $exit->map;
2843 my $x = $exit->stats->hp; 3045 my $x = $exit->stats->hp;
2844 my $y = $exit->stats->sp; 3046 my $y = $exit->stats->sp;
3047
3048 # special map handling
3049 my $slaying = $exit->slaying;
3050
3051 # special map handling
3052 if ($slaying eq "/!") {
3053 my $guard = cf::lock_acquire "exit_prepare:$exit";
3054
3055 prepare_random_map $exit
3056 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3057
3058 $map = $exit->slaying;
3059
3060 } elsif ($slaying eq '!up') {
3061 $map = $exit->map->tile_path (cf::TILE_UP);
3062 $x = $exit->x;
3063 $y = $exit->y;
3064
3065 } elsif ($slaying eq '!down') {
3066 $map = $exit->map->tile_path (cf::TILE_DOWN);
3067 $x = $exit->x;
3068 $y = $exit->y;
3069 }
2845 3070
2846 $self->goto ($map, $x, $y); 3071 $self->goto ($map, $x, $y);
2847 3072
2848 # if exit is damned, update players death & WoR home-position 3073 # if exit is damned, update players death & WoR home-position
2849 $self->contr->savebed ($map, $x, $y) 3074 $self->contr->savebed ($map, $x, $y)
2864 3089
2865=head3 cf::client 3090=head3 cf::client
2866 3091
2867=over 4 3092=over 4
2868 3093
2869=item $client->send_drawinfo ($text, $flags)
2870
2871Sends a drawinfo packet to the client. Circumvents output buffering so
2872should not be used under normal circumstances.
2873
2874=cut
2875
2876sub cf::client::send_drawinfo {
2877 my ($self, $text, $flags) = @_;
2878
2879 utf8::encode $text;
2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt) 3094=item $client->send_big_packet ($pkt)
2884 3095
2885Like C<send_packet>, but tries to compress large packets, and fragments 3096Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required. 3097them as required.
2887 3098
2905 $self->send_packet ($pkt); 3116 $self->send_packet ($pkt);
2906} 3117}
2907 3118
2908=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2909 3120
2910Send a drawinfo or msg packet to the client, formatting the msg for the 3121Send a msg packet to the client, formatting the msg for the client if
2911client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2912the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
2913the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2914 3125
2915=cut 3126=cut
2916 3127
2917# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2960 }, 3171 },
2961 "c/body" => { 3172 "c/body" => {
2962 id => "infobox", 3173 id => "infobox",
2963 title => "Body Parts", 3174 title => "Body Parts",
2964 reply => undef, 3175 reply => undef,
2965 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
2966 }, 3177 },
2967 "c/statistics" => { 3178 "c/statistics" => {
2968 id => "infobox", 3179 id => "infobox",
2969 title => "Statistics", 3180 title => "Statistics",
2970 reply => undef, 3181 reply => undef,
3022 id => "death", 3233 id => "death",
3023 title => "Death", 3234 title => "Death",
3024 reply => undef, 3235 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
3026 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
3027 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
3029); 3246);
3030 3247
3031sub cf::client::send_msg { 3248sub cf::client::send_msg {
3074=cut 3291=cut
3075 3292
3076sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
3077 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
3078 3295
3079 if ($self->extcmd == 2) {
3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3081 } elsif ($self->extcmd == 1) { # TODO: remove
3082 push @msg, msgtype => "event_$type";
3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3084 }
3085}
3086
3087=item $client->ext_reply ($msgid, @msg)
3088
3089Sends an ext reply to the client.
3090
3091=cut
3092
3093sub cf::client::ext_reply($$@) {
3094 my ($self, $id, @msg) = @_;
3095
3096 if ($self->extcmd == 2) {
3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3098 } elsif ($self->extcmd == 1) {
3099 #TODO: version 1, remove
3100 unshift @msg, msgtype => "reply", msgid => $id;
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102 }
3103} 3297}
3104 3298
3105=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
3106 3300
3107Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
3127 3321
3128 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
3129 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
3130 3324
3131 1 3325 1
3326}
3327
3328=item $client->update_command_faces
3329
3330=cut
3331
3332our %COMMAND_FACE;
3333
3334sub cf::client::update_command_faces {
3335 my ($self) = @_;
3336
3337 my @faces = grep $_,
3338 $COMMAND_FACE{preferred},
3339 $COMMAND_FACE{standard},
3340 $COMMAND_FACE{skill},
3341 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3342 $COMMAND_FACE{emote},
3343 ;
3344
3345 $self->send_face ($_)
3346 for @faces;
3347 $self->flush_fx;
3348
3349 $self->ext_msg (command_list => @faces);
3350}
3351
3352=item cf::client::set_command_face $type, $commands
3353
3354=cut
3355
3356sub cf::client::set_command_face {
3357 my ($type, $list) = @_;
3358
3359 my $idx = &cf::face::set ( #d# ugly forward reference
3360 "command_list/$type" => cf::FT_RSRC,
3361 JSON::XS->new->utf8->encode ([ sort @$list ])
3362 );
3363
3364 $COMMAND_FACE{$type} = $idx;
3132} 3365}
3133 3366
3134cf::client->attach ( 3367cf::client->attach (
3135 on_connect => sub { 3368 on_connect => sub {
3136 my ($ns) = @_; 3369 my ($ns) = @_;
3162 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
3163 3396
3164 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3165 3398
3166 if (ref $msg) { 3399 if (ref $msg) {
3167 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3168 "ARRAY" eq ref $msg
3169 ? @$msg
3170 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3171 3401
3172 my @reply;
3173
3174 if (my $cb = $EXTICMD{$type}) { 3402 if (my $cb = $EXTIACMD{$type}) {
3403 $cb->(
3404 $ns,
3405 sub {
3406 $ns->ext_msg ("reply-$reply", @_)
3407 if $reply;
3408 },
3409 @payload
3410 );
3411 } else {
3412 my @reply;
3413
3414 if (my $cb = $EXTICMD{$type}) {
3175 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3176 } 3420 }
3177
3178 $ns->ext_reply ($reply, @reply)
3179 if $reply;
3180
3181 } else { 3421 } else {
3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3422 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3183 } 3423 }
3184 3424
3185 cf::override; 3425 cf::override;
3268 decrease split destroy change_exp value msg lore send_msg)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3269 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3270 ["cf::player" => qw(peaceful send_msg)], 3510 ["cf::player" => qw(peaceful send_msg)],
3271 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3272) { 3512) {
3273 no strict 'refs';
3274 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276 for @funs; 3515 for @funs;
3277} 3516}
3278 3517
3354=cut 3593=cut
3355 3594
3356############################################################################# 3595#############################################################################
3357# the server's init and main functions 3596# the server's init and main functions
3358 3597
3598{
3599 package cf::face;
3600
3601 our %HASH; # hash => idx
3602 our @DATA; # dynamically-created facedata, only faceste 0 used
3603 our @FOFS; # file offset, if > 0
3604 our @SIZE; # size of face, in octets
3605 our @META; # meta hash of face, if any
3606 our $DATAFH; # facedata filehandle
3607
3608 # internal api, not finalised
3609 sub set {
3610 my ($name, $type, $data) = @_;
3611
3612 my $idx = cf::face::find $name;
3613
3614 if ($idx) {
3615 delete $HASH{cf::face::get_csum $idx};
3616 } else {
3617 $idx = cf::face::alloc $name;
3618 }
3619
3620 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3621
3622 cf::face::set_type $idx, $type;
3623 cf::face::set_csum $idx, 0, $hash;
3624
3625 # we need to destroy the SV itself, not just modify it, as a running ix
3626 # might hold a reference to it: "delete" achieves that.
3627 delete $FOFS[0][$idx];
3628 delete $DATA[0][$idx];
3629 $DATA[0][$idx] = $data;
3630 $SIZE[0][$idx] = length $data;
3631 delete $META[$idx];
3632 $HASH{$hash} = $idx;#d#
3633
3634 $idx
3635 }
3636
3637 sub _get_data($$$) {
3638 my ($idx, $set, $cb) = @_;
3639
3640 if (defined $DATA[$set][$idx]) {
3641 $cb->($DATA[$set][$idx]);
3642 } elsif (my $fofs = $FOFS[$set][$idx]) {
3643 my $size = $SIZE[$set][$idx];
3644 my $buf;
3645 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3646 if ($_[0] == $size) {
3647 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3648 $cb->($buf);
3649 } else {
3650 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3651 }
3652 };
3653 } else {
3654 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3655 }
3656 }
3657
3658 # rather ineffient
3659 sub cf::face::get_data($;$) {
3660 my ($idx, $set) = @_;
3661
3662 _get_data $idx, $set, Coro::rouse_cb;
3663 Coro::rouse_wait
3664 }
3665
3666 sub cf::face::ix {
3667 my ($ns, $set, $idx, $pri) = @_;
3668
3669 _get_data $idx, $set, sub {
3670 $ns->ix_send ($idx, $pri, $_[0]);
3671 };
3672 }
3673}
3674
3359sub load_facedata($) { 3675sub load_facedata($) {
3360 my ($path) = @_; 3676 my ($path) = @_;
3361 3677
3362 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?)
3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3365
3366 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367 3679
3368 trace "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3369 3681
3370 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3371 0 < aio_load $path, $facedata
3372 or die "$path: $!";
3373
3374 $facedata = Coro::Storable::thaw $facedata;
3375 3683
3376 $facedata->{version} == 2 3684 $facedata->{version} == 2
3377 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3378 3686
3379 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3381 $facedata->{resource}{"res/exp_table"} = { 3689
3382 type => FT_RSRC, 3690 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3383 data => $exp_table, 3691
3384 hash => (Digest::MD5::md5 $exp_table), 3692 # BEGIN ATOMIC
3385 }; 3693 # from here on, everything must be atomic - no thread switch allowed
3386 cf::cede_to_tick; 3694 my $t1 = EV::time;
3387 3695
3388 { 3696 {
3389 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3390 3698
3391 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3392 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393 3702
3394 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3395 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3705 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3706 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3398 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3399 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3400 } 3710 }
3401 3711
3402 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3403 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3404 3714
3409 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3411 } else { 3721 } else {
3412 error "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3413 } 3723 }
3414
3415 cf::cede_to_tick;
3416 } 3724 }
3417 } 3725 }
3418 3726
3419 { 3727 {
3420 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3421 3729
3422 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3423 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3424 cf::cede_to_tick;
3425 } 3732 }
3426 3733
3427 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3428 } 3735 }
3429 3736
3430 { 3737 {
3431 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3432 3739
3433 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3434 if (defined $info->{type}) { 3741 if (defined (my $type = $info->{type})) {
3742 # TODO: different hash - must free and use new index, or cache ixface data queue
3435 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3436 3744
3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3438 cf::face::set_type $idx, $info->{type}; 3745 cf::face::set_type $idx, $type;
3746 cf::face::set_csum $idx, 0, $info->{hash};
3747 $cf::face::SIZE[0][$idx] = $info->{size};
3748 $cf::face::FOFS[0][$idx] = $info->{fofs};
3749 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3750 $cf::face::HASH{$info->{hash}} = $idx;
3439 } else { 3751 } else {
3440 $RESOURCE{$name} = $info; # unused 3752# $RESOURCE{$name} = $info; # unused
3441 } 3753 }
3442
3443 cf::cede_to_tick;
3444 } 3754 }
3445 } 3755 }
3756
3757 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3758
3759 # HACK to clear player env face cache, we need some signal framework
3760 # for this (global event?)
3761 %ext::player_env::MUSIC_FACE_CACHE = ();
3762
3763 # END ATOMIC
3764
3765 cf::debug "facedata atomic update time ", EV::time - $t1;
3446 3766
3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3768
3769 aio_close $fh if $fh; # close old facedata
3448 3770
3449 1 3771 1
3450} 3772}
3451 3773
3452register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3463 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3464 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3465 cf::arch::commit_load; 3787 cf::arch::commit_load;
3466 3788
3467 $status 3789 $status
3790}
3791
3792sub reload_exp_table {
3793 _reload_exp_table;
3794
3795 cf::face::set
3796 "res/exp_table" => FT_RSRC,
3797 JSON::XS->new->utf8->canonical->encode (
3798 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3799 );
3800}
3801
3802sub reload_materials {
3803 _reload_materials;
3468} 3804}
3469 3805
3470sub reload_regions { 3806sub reload_regions {
3471 # HACK to clear player env face cache, we need some signal framework 3807 # HACK to clear player env face cache, we need some signal framework
3472 # for this (global event?) 3808 # for this (global event?)
3480 if exists $_->{match}; 3816 if exists $_->{match};
3481 } 3817 }
3482} 3818}
3483 3819
3484sub reload_facedata { 3820sub reload_facedata {
3485 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3486 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3487} 3823}
3488 3824
3489sub reload_archetypes { 3825sub reload_archetypes {
3490 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3491 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3828
3829 cf::face::set
3830 "res/skill_info" => FT_RSRC,
3831 JSON::XS->new->utf8->canonical->encode (
3832 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3833 );
3834
3835 cf::face::set
3836 "res/spell_paths" => FT_RSRC,
3837 JSON::XS->new->utf8->canonical->encode (
3838 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3839 );
3840
3841 # command completion
3842 my @commands;
3843
3844 for (0..cf::arch::skillvec_size - 1) {
3845 my $skill = cf::arch::skillvec $_;
3846 my $name = $skill->name;
3847 my $flags = cf::skill_flags $skill->subtype;
3848
3849 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3850 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3851 }
3852
3853 cf::client::set_command_face skill => \@commands;
3492} 3854}
3493 3855
3494sub reload_treasures { 3856sub reload_treasures {
3495 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3496 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3497} 3859}
3498 3860
3499sub reload_sound { 3861sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n"; 3862 trace "loading sound config from $DATADIR/sound\n";
3501 3863
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3864 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506 3865
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3866 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_] 3867 my $sound = $soundconf->{compat}[$_]
3509 or next; 3868 or next;
3510 3869
3520} 3879}
3521 3880
3522sub reload_resources { 3881sub reload_resources {
3523 trace "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3524 3883
3884 reload_materials;
3525 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3526 reload_sound; 3887 reload_sound;
3527 reload_archetypes; 3888 reload_archetypes;
3528 reload_regions; 3889 reload_regions;
3529 reload_treasures; 3890 reload_treasures;
3530 3891
3532} 3893}
3533 3894
3534sub reload_config { 3895sub reload_config {
3535 trace "reloading config file...\n"; 3896 trace "reloading config file...\n";
3536 3897
3537 open my $fh, "<:utf8", "$CONFDIR/config" 3898 my $config = load_file "$CONFDIR/config";
3538 or return; 3899 utf8::decode $config;
3539 3900 *CFG = decode_yaml $config;
3540 local $/;
3541 *CFG = YAML::XS::Load scalar <$fh>;
3542 3901
3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544 3903
3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3904 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3905 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3909 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551 and die "WARNING: m(un)lockall failed: $!\n"; 3910 and die "WARNING: m(un)lockall failed: $!\n";
3552 }; 3911 };
3553 warn $@ if $@; 3912 warn $@ if $@;
3554 } 3913 }
3555
3556 trace "finished reloading resource files\n";
3557} 3914}
3558 3915
3559sub pidfile() { 3916sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3917 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!"; 3918 or die "$PIDFILE: $!";
3574 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3575 print $fh $$; 3932 print $fh $$;
3576} 3933}
3577 3934
3578sub main_loop { 3935sub main_loop {
3579 trace "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3580 if (1) { 3937 if (1) {
3581 EV::loop; 3938 EV::run;
3582 } 3939 }
3583 trace "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3585} 3942}
3586 3943
3587sub main { 3944sub main {
3588 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3589 3946
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3947 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3948 LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3949 LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594 3952
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3953 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596 3954
3597 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3598 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3957 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3600 (async { 3958 (async {
3601 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3602 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3603 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3604 }; 3962 };
3605 3963
3606 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3607 3965
3608 cf::sync_job { 3966 cf::sync_job {
3609 cf::init_experience; 3967 cf::incloader::init ();
3968
3969 db_init;
3970
3610 cf::init_anim; 3971 cf::init_anim;
3611 cf::init_attackmess; 3972 cf::init_attackmess;
3612 cf::init_dynamic; 3973 cf::init_dynamic;
3613 3974
3614 cf::load_settings; 3975 cf::load_settings;
3615 cf::load_materials;
3616 3976
3617 reload_resources; 3977 reload_resources;
3618 reload_config; 3978 reload_config;
3619 db_init;
3620 3979
3621 cf::init_uuid; 3980 cf::init_uuid;
3622 cf::init_signals; 3981 cf::init_signals;
3623 cf::init_skills; 3982 cf::init_skills;
3624 3983
3632 3991
3633 # no (long-running) fork's whatsoever before this point(!) 3992 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX (); 3993 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3994 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636 3995
3637 (pop @POST_INIT)->(0) while @POST_INIT; 3996 cf::_post_init 0;
3638 }; 3997 };
3639 3998
3640 cf::object::thawer::errors_are_fatal 0; 3999 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n"; 4000 info "parse errors in files are no longer fatal from this point on.\n";
3642 4001
4002 AE::postpone {
4003 undef &main; # free gobs of memory :)
4004 };
4005
3643 main_loop; 4006 goto &main_loop;
3644} 4007}
3645 4008
3646############################################################################# 4009#############################################################################
3647# initialisation and cleanup 4010# initialisation and cleanup
3648 4011
3747sub emergency_save() { 4110sub emergency_save() {
3748 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3749 4112
3750 info "emergency_perl_save: enter\n"; 4113 info "emergency_perl_save: enter\n";
3751 4114
4115 # this is a trade-off: we want to be very quick here, so
4116 # save all maps without fsync, and later call a global sync
4117 # (which in turn might be very very slow)
4118 local $USE_FSYNC = 0;
4119
3752 cf::sync_job { 4120 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so 4121 cf::write_runtime_sync; # external watchdog should not bark
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757 4122
3758 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3759 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3760 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3761 info "emergency_perl_save: begin player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766 $pl->save; 4131 $pl->save;
3767 } 4132 }
3768 info "emergency_perl_save: end player save\n"; 4133 info "emergency_perl_save: end player save\n";
3769 4134
4135 cf::write_runtime_sync; # external watchdog should not bark
4136
3770 info "emergency_perl_save: begin map save\n"; 4137 info "emergency_perl_save: begin map save\n";
3771 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3772 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3773 $map->valid or next; 4140 $map->valid or next;
3774 $map->save; 4141 $map->save;
3775 } 4142 }
3776 info "emergency_perl_save: end map save\n"; 4143 info "emergency_perl_save: end map save\n";
3777 4144
4145 cf::write_runtime_sync; # external watchdog should not bark
4146
3778 info "emergency_perl_save: begin database checkpoint\n"; 4147 info "emergency_perl_save: begin database checkpoint\n";
3779 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3780 info "emergency_perl_save: end database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
3781 4150
3782 info "emergency_perl_save: begin write uuid\n"; 4151 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1; 4152 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n"; 4153 info "emergency_perl_save: end write uuid\n";
3785 };
3786 4154
4155 cf::write_runtime_sync; # external watchdog should not bark
4156
4157 trace "emergency_perl_save: syncing database to disk";
4158 BDB::db_env_txn_checkpoint $DB_ENV;
4159
3787 info "emergency_perl_save: starting sync()\n"; 4160 info "emergency_perl_save: starting sync\n";
3788 IO::AIO::aio_sync sub { 4161 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n"; 4162 info "emergency_perl_save: finished sync\n";
4163 };
4164
4165 cf::write_runtime_sync; # external watchdog should not bark
4166
4167 trace "emergency_perl_save: flushing outstanding aio requests";
4168 while (IO::AIO::nreqs || BDB::nreqs) {
4169 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4170 }
4171
4172 cf::write_runtime_sync; # external watchdog should not bark
3790 }; 4173 };
3791 4174
3792 info "emergency_perl_save: leave\n"; 4175 info "emergency_perl_save: leave\n";
3793} 4176}
3794 4177
3795sub post_cleanup { 4178sub post_cleanup {
3796 my ($make_core) = @_; 4179 my ($make_core) = @_;
4180
4181 IO::AIO::flush;
3797 4182
3798 error Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3799 if $make_core; 4184 if $make_core;
3800 4185
3801 my $fh = pidfile; 4186 my $fh = pidfile;
3827 } 4212 }
3828} 4213}
3829 4214
3830sub do_reload_perl() { 4215sub do_reload_perl() {
3831 # can/must only be called in main 4216 # can/must only be called in main
3832 if (in_main) { 4217 unless (in_main) {
3833 error "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3834 return; 4219 return;
3835 } 4220 }
3836 4221
3837 return if $RELOAD++; 4222 return if $RELOAD++;
3838 4223
3839 my $t1 = AE::time; 4224 my $t1 = AE::time;
3840 4225
3841 while ($RELOAD) { 4226 while ($RELOAD) {
4227 cf::get_slot 0.1, -1, "reload_perl";
3842 info "reloading..."; 4228 info "perl_reload: reloading...";
3843 4229
3844 trace "entering sync_job"; 4230 trace "perl_reload: entering sync_job";
3845 4231
3846 cf::sync_job { 4232 cf::sync_job {
3847 cf::write_runtime_sync; # external watchdog should not bark
3848 cf::emergency_save; 4233 #cf::emergency_save;
3849 cf::write_runtime_sync; # external watchdog should not bark
3850 4234
3851 trace "syncing database to disk";
3852 BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854 # if anything goes wrong in here, we should simply crash as we already saved
3855
3856 trace "flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 trace "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3862 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3863 %EXT_CORO = (); 4237 %EXT_CORO = ();
3864 4238
3865 trace "removing commands"; 4239 trace "perl_reload: removing commands";
3866 %COMMAND = (); 4240 %COMMAND = ();
3867 4241
3868 trace "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3869 %EXTCMD = (); 4243 %EXTCMD = ();
3870 %EXTICMD = (); 4244 %EXTICMD = ();
3871 4245
3872 trace "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3873 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3874 trace "... unloading $pkg"; 4248 trace "... unloading $pkg";
3875 4249
3876 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3877 eval { 4251 eval {
3882 4256
3883 trace "... clearing $pkg"; 4257 trace "... clearing $pkg";
3884 clear_package $pkg; 4258 clear_package $pkg;
3885 } 4259 }
3886 4260
3887 trace "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890 4264
3891 trace "... unloading $k"; 4265 trace "... unloading $k";
3892 delete $INC{$k}; 4266 delete $INC{$k};
3899 } 4273 }
3900 4274
3901 clear_package $k; 4275 clear_package $k;
3902 } 4276 }
3903 4277
3904 trace "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3905 clear_package "safe::$_" 4279 clear_package "safe::$_"
3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4280 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907 4281
3908 trace "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3909 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911 4285
3912 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3913 # and global variables created in xs 4287 # and global variables created in xs
3914 #clear_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3915 4289
3916 info "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3917 4291
3918 trace "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3919 require cf; 4293 require cf;
3920 cf::_connect_to_perl_1; 4294 cf::_connect_to_perl_1;
3921 4295
3922 trace "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3923 cf::reload_config; 4297 cf::reload_config;
3924 4298
3925 trace "loading extensions"; 4299 trace "perl_reload: loading extensions";
3926 cf::load_extensions; 4300 cf::load_extensions;
3927 4301
3928 if ($REATTACH_ON_RELOAD) { 4302 if ($REATTACH_ON_RELOAD) {
3929 trace "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3930 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3931 trace "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3932 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3933 trace "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3934 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
3935 } 4309 }
3936 4310
3937 trace "running post_init jobs"; 4311 cf::_post_init 1;
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939 4312
3940 trace "leaving sync_job"; 4313 trace "perl_reload: leaving sync_job";
3941 4314
3942 1 4315 1
3943 } or do { 4316 } or do {
3944 error $@; 4317 error $@;
3945 cf::cleanup "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3946 }; 4319 };
3947 4320
3948 info "reloaded";
3949 --$RELOAD; 4321 --$RELOAD;
3950 } 4322 }
3951 4323
3952 $t1 = AE::time - $t1; 4324 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n"; 4325 info "perl_reload: completed in ${t1}s\n";
3954}; 4326};
3955 4327
3956our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3957 4329
3958sub reload_perl() { 4330sub reload_perl() {
3979 reload_perl; 4351 reload_perl;
3980 }; 4352 };
3981 } 4353 }
3982}; 4354};
3983 4355
3984unshift @INC, $LIBDIR; 4356#############################################################################
3985 4357
3986my $bug_warning = 0; 4358my $bug_warning = 0;
3987 4359
3988our @WAIT_FOR_TICK;
3989our @WAIT_FOR_TICK_BEGIN;
3990
3991sub wait_for_tick { 4360sub wait_for_tick() {
3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3993 4362
3994 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3995 push @WAIT_FOR_TICK, $signal;
3996 $signal->wait;
3997} 4364}
3998 4365
3999sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4001 4368
4002 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
4003 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
4004 $signal->wait; 4371 $signal->wait;
4005} 4372}
4009 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4376 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4010 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
4011 return; 4378 return;
4012 } 4379 }
4013 4380
4014 cf::server_tick; # one server iteration 4381 cf::one_tick; # one server iteration
4015 4382
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4383 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017 4384
4018 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4386 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4025 } 4392 }
4026 4393
4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4028 $sig->send; 4395 $sig->send;
4029 } 4396 }
4030 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
4031 $sig->send;
4032 }
4033 4398
4034 $LOAD = ($NOW - $TICK_START) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
4035 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4036 4401
4037 if (0) { 4402 if (0) {
4043 } 4408 }
4044} 4409}
4045 4410
4046{ 4411{
4047 # configure BDB 4412 # configure BDB
4413 info "initialising database";
4048 4414
4049 BDB::min_parallel 16; 4415 BDB::min_parallel 16;
4050 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
4051 $AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
4052 4418
4053 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
4054 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
4055 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4422 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4081 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4082 }; 4448 };
4083 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4084 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4085 }; 4451 };
4452
4453 info "database initialised";
4086} 4454}
4087 4455
4088{ 4456{
4089 # configure IO::AIO 4457 # configure IO::AIO
4090 4458
4459 info "initialising aio";
4091 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
4092 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
4093 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
4094} 4464}
4095 4465
4096my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
4097 4468
4098sub _log_backtrace { 4469sub _log_backtrace {
4099 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
4100 4471
4101 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
4102 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4103 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
4104 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
4105 ++$_log_backtrace; 4480 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg; 4481 my $perl_bt = Carp::longmess $msg;
4107 async { 4482 async {
4108 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
4109 4484
4129 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
4130 --$_log_backtrace; 4505 --$_log_backtrace;
4131 }; 4506 };
4132 } else { 4507 } else {
4133 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
4134 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4135 } 4510 }
4136} 4511}
4137 4512
4138# load additional modules 4513# load additional modules
4139require "cf/$_.pm" for @EXTRA_MODULES; 4514require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines