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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 4000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
115 124
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 127our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
121our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 133our $DB_ENV;
125 134
126our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 136
128our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 139
130our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
132our $NOW; 143our $NOW;
133 144
134our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
145 156
146our @POST_INIT; 157our @POST_INIT;
147 158
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
150 164
151binmode STDOUT; 165binmode STDOUT;
152binmode STDERR; 166binmode STDERR;
153 167
154# read virtual server time, if available 168# read virtual server time, if available
188 202
189=over 4 203=over 4
190 204
191=item $cf::UPTIME 205=item $cf::UPTIME
192 206
193The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
194 223
195=item $cf::RUNTIME 224=item $cf::RUNTIME
196 225
197The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
198every server tick. 227every server tick.
199 228
200=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203 232
204Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
207database environment. 236database environment.
208 237
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 238=item $cf::LOADAVG
218 239
219The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
220(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
221objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
230from wherever your confdir points to. 251from wherever your confdir points to.
231 252
232=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
233 254
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
237 275
238=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
239 277
240This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
249 287
250=back 288=back
251 289
252=cut 290=cut
253 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
254$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 299 my $msg = join "", @_;
256 300
257 $msg .= "\n" 301 $msg .= "\n"
258 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
259 303
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 305
262 LOG llevError, $msg; 306 LOG llevWarn, $msg;
263}; 307};
264 308
265$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
267 311
268 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
269 313
270 if (in_main) {#d# 314 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 316 return;#d#
273 }#d# 317 }#d#
274 318
275 # kill coroutine otherwise 319 # kill coroutine otherwise
276 Coro::terminate 320 Coro::terminate
296)) { 340)) {
297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298} 342}
299 343
300$EV::DIED = sub { 344$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
302}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
303 352
304############################################################################# 353#############################################################################
305 354
306=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
307 356
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 378 $d
330 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
331} 380}
332 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
333=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
334 435
335Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
336 437
337=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 445
345sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
347 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
348=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
349 481
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
352 484
353The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 486is a reload or not.
355 487
356=cut 488=cut
357 489
358sub post_init(&) { 490sub post_init(&) {
359 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
360} 509}
361 510
362=item cf::lock_wait $string 511=item cf::lock_wait $string
363 512
364Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
417 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
418} 567}
419 568
420=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
421 570
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
425 578
426The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
428 581
429Useful for short background jobs. 582Useful for short background jobs.
458 } 611 }
459 } 612 }
460 613
461 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
462 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
463 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 617 } else {
466 $busy = 0; 618 $busy = 0;
467 Coro::schedule; 619 Coro::schedule;
468 } 620 }
469 } 621 }
509=cut 661=cut
510 662
511sub sync_job(&) { 663sub sync_job(&) {
512 my ($job) = @_; 664 my ($job) = @_;
513 665
514 if ($Coro::current == $Coro::main) { 666 if (in_main) {
515 my $time = AE::time; 667 my $time = AE::time;
516 668
517 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
519 671
520 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
521 673
522 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
523 675
524 my $busy = 1; 676 my $busy = 1;
525 my @res; 677 my @res;
526 678
527 (async { 679 (async {
528 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 681 @res = eval { $job->() };
530 warn $@ if $@; 682 error $@ if $@;
531 undef $busy; 683 undef $busy;
532 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
533 685
534 while ($busy) { 686 while ($busy) {
535 if (Coro::nready) { 687 if (Coro::nready) {
569 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
570 722
571 $coro 723 $coro
572} 724}
573 725
574=item fork_call { }, $args 726=item fork_call { }, @args
575 727
576Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 731never block itself or use any form of event handling.
580 732
581=cut 733=cut
582 734
735sub post_fork {
736 reset_signals;
737}
738
583sub fork_call(&@) { 739sub fork_call(&@) {
584 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
585 741
586 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
589 745
590 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
591 reset_signals; 747 cf::post_fork;
592 &$cb 748 &$cb
593 }, @args; 749 } @args;
594 750
595 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
596} 752}
597 753
598sub objinfo { 754sub objinfo {
648within each server. 804within each server.
649 805
650=cut 806=cut
651 807
652sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
653 my ($name) = @_; 812 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
655 814
656 eval { 815 eval {
657 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
667} 826}
668 827
669our $DB; 828our $DB;
670 829
671sub db_init { 830sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
674 };
675} 832}
676 833
677sub db_get($$) { 834sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
679 836
680 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
681 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
682 841
683 $! ? () 842 $! ? ()
684 : $data 843 : $data
685 }
686} 844}
687 845
688sub db_put($$$) { 846sub db_put($$$) {
689 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
718 876
719 my @data; 877 my @data;
720 my $md5; 878 my $md5;
721 879
722 for (0 .. $#$src) { 880 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 882 }
726 883
727 # if processing is expensive, check 884 # if processing is expensive, check
728 # checksum first 885 # checksum first
729 if (1) { 886 if (1) {
746 903
747 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 905 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
750 907
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 909
753 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
756 913
766 923
767=cut 924=cut
768 925
769sub datalog($@) { 926sub datalog($@) {
770 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 929}
773 930
774=back 931=back
775 932
776=cut 933=cut
971 1128
972 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1131
975 } elsif (ref $type) { 1132 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
977 1134
978 } else { 1135 } else {
979 shift @arg; 1136 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
981 } 1138 }
982 } 1139 }
983} 1140}
984 1141
985sub _object_attach { 1142sub _object_attach {
995 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
996 } 1153 }
997 1154
998 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
999 } else { 1156 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1158 }
1002 1159
1003 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1004} 1161}
1005 1162
1064 1221
1065 for (@$callbacks) { 1222 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1067 1224
1068 if ($@) { 1225 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1227 override;
1072 } 1228 }
1073 1229
1074 return 1 if $override; 1230 return 1 if $override;
1075 } 1231 }
1154 for (@$attach) { 1310 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1157 } 1313 }
1158 } else { 1314 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1316 }
1161 } 1317 }
1162} 1318}
1163 1319
1164cf::attachable->attach ( 1320cf::attachable->attach (
1191 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1192 1348
1193 sync_job { 1349 sync_job {
1194 if (length $$rdata) { 1350 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1198 1355
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1224 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1225 1382
1226 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1385 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1230 } 1387 }
1231 } else { 1388 } else {
1232 aio_unlink $filename; 1389 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1234 } 1391 }
1258 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1416 $av = $st->{objs};
1260 } 1417 }
1261 1418
1262 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1265 1423
1266 ($data, $av) 1424 ($data, $av)
1267} 1425}
1268 1426
1269=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1273=cut 1431=cut
1274 1432
1275############################################################################# 1433#############################################################################
1276# command handling &c 1434# command handling &c
1277 1435
1278=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1279 1437
1280Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1281$name. 1439$name.
1282 1440
1283=cut 1441=cut
1289 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1290 1448
1291 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1292} 1450}
1293 1451
1294=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1295 1453
1296Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1297extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1298received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1299the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1300has logged in successfully. 1458has logged in successfully.
1301 1459
1302If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1303called. 1461called.
1304 1462
1305=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1306 1464
1307Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1308exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1309are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1310is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1346 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1347 1505
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1507
1350 if (ref $msg) { 1508 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1510
1356 my @reply; 1511 my @reply;
1357 1512
1358 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1360 } 1515 }
1361 1516
1362 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1363 if $reply; 1518 if $reply;
1364 1519
1365 } else { 1520 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1522 }
1368 1523
1369 cf::override; 1524 cf::override;
1370 }, 1525 },
1371); 1526);
1381 }; 1536 };
1382 1537
1383 $grp 1538 $grp
1384} 1539}
1385 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1386sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1387 cf::sync_job { 1557 cf::sync_job {
1388 my %todo; 1558 my %todo;
1389 1559
1390 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1561 next unless -r $path;
1409 1579
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1582
1413 $ext{source} = 1583 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1416 . $source 1586 . $source
1417 . "\n};\n1"; 1587 . "\n};\n1";
1418 1588
1419 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1431 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1602 next ext
1433 unless exists $done{$_}; 1603 unless exists $done{$_};
1434 } 1604 }
1435 1605
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1438 my $active = eval $v->{source}; 1617 my $active = eval $source;
1439 1618
1440 if (length $@) { 1619 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1442 1621
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1445 1624
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1448 } else { 1627 } else {
1449 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1451 $progress = 1; 1630 $progress = 1;
1452 1631
1453 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1633 unless $active;
1455 } 1634 }
1456 } 1635 }
1457 1636
1458 unless ($progress) { 1637 unless ($progress) {
1460 1639
1461 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1464 } 1643 }
1644
1645 last;
1465 } 1646 }
1466 } 1647 }
1467 }; 1648 };
1468} 1649}
1469 1650
1627 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1628 1809
1629 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1812
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1814 $pl->deactivate;
1815
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1637 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1638 1821
1639 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1727 1910
1728=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1729 1912
1730Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1731 1914
1732=item $player->ext_reply ($msgid, @msg)
1733
1734Sends an ext reply to the player.
1735
1736=cut
1737
1738sub ext_reply($$@) {
1739 my ($self, $id, @msg) = @_;
1740
1741 $self->ns->ext_reply ($id, @msg)
1742}
1743
1744=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1745 1916
1746Sends an ext event to the client. 1917Sends an ext event to the client.
1747 1918
1748=cut 1919=cut
1807sub generate_random_map { 1978sub generate_random_map {
1808 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1809 1980
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1982
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1984}
1827 1985
1828=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1829 1987
1830Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
1835 1993
1836sub register { 1994sub register {
1837 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1996 my $pkg = caller;
1839 1997
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1999
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 2001}
1845 2002
1857} 2014}
1858 2015
1859sub normalise { 2016sub normalise {
1860 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1861 2018
1862 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1863 2020
1864 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1865 2022
1866 # map plan: 2023 # map plan:
1867 # 2024 #
1882 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 2040 $path = "$base/$path";
1884 } 2041 }
1885 2042
1886 for ($path) { 2043 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1890 } 2046 }
1891 2047
1892 $path 2048 $path
1906 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1907 return $self; 2063 return $self;
1908 } 2064 }
1909 } 2065 }
1910 2066
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2068 ()
1913} 2069}
1914 2070
2071# may re-bless or do other evil things
1915sub init { 2072sub init {
1916 my ($self) = @_; 2073 my ($self) = @_;
1917 2074
1918 $self 2075 $self
1919} 2076}
1984 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1985 2142
1986 1 2143 1
1987} 2144}
1988 2145
2146# used to laod the header of an original map
1989sub load_header_orig { 2147sub load_header_orig {
1990 my ($self) = @_; 2148 my ($self) = @_;
1991 2149
1992 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1993} 2151}
1994 2152
2153# used to laod the header of an instantiated map
1995sub load_header_temp { 2154sub load_header_temp {
1996 my ($self) = @_; 2155 my ($self) = @_;
1997 2156
1998 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1999} 2158}
2000 2159
2160# called after loading the header from an instantiated map
2001sub prepare_temp { 2161sub prepare_temp {
2002 my ($self) = @_; 2162 my ($self) = @_;
2003 2163
2004 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
2006 # safety 2166 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2169}
2010 2170
2171# called after loading the header from an original map
2011sub prepare_orig { 2172sub prepare_orig {
2012 my ($self) = @_; 2173 my ($self) = @_;
2013 2174
2014 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
2039 2200
2040sub find; 2201sub find;
2041sub find { 2202sub find {
2042 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2043 2204
2205 cf::cede_to_tick;
2206
2044 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2045 2208
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2211
2049 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
2080 2243
2081 { 2244 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2083 2246
2084 return unless $self->valid; 2247 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2249
2089 $self->alloc; 2250 $self->alloc;
2090 2251
2091 $self->pre_load; 2252 $self->pre_load;
2092 cf::cede_to_tick; 2253 cf::cede_to_tick;
2093 2254
2255 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2257 $f->skip_block;
2096 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2097 or return; 2259 or return;
2098 2260
2099 $self->post_load_original 2261 $self->post_load_original
2100 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2101 2263
2102 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2265 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2268 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2109 } 2272 }
2110 } 2273 }
2111 }
2112 2274
2113 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2114 2282
2115 cf::cede_to_tick; 2283 cf::cede_to_tick;
2116 # now do the right thing for maps 2284 # now do the right thing for maps
2117 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2122 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2291 $self->decay_objects;
2124 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2125 $self->update_buttons; 2293 $self->update_buttons;
2126 cf::cede_to_tick; 2294 cf::cede_to_tick;
2127 $self->activate; 2295 #$self->activate; # no longer activate maps automatically
2128 } 2296 }
2129 2297
2130 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2300 }
2135 2301
2136 $self->post_load; 2302 $self->post_load;
2303
2304 1
2137} 2305}
2138 2306
2139# customize the map for a given player, i.e. 2307# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2308# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2309# maps to change the path to ~playername/mappath
2149# if $self->per_party; 2317# if $self->per_party;
2150 2318
2151 $self 2319 $self
2152} 2320}
2153 2321
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2322sub find_sync {
2181 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2182 2324
2183 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2184} 2330}
2185 2331
2186sub do_load_sync { 2332sub do_load_sync {
2187 my ($map) = @_; 2333 my ($map) = @_;
2188 2334
2335 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2191 2338
2192 cf::sync_job { $map->load }; 2339 $map->load;
2193} 2340}
2194 2341
2195our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2197 2344
2198sub find_async { 2345sub find_async {
2199 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2200 2347
2201 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2202 2349
2203 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2205 } 2352 }
2206 2353
2207 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2208 2355
2209 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2268sub swap_out { 2415sub swap_out {
2269 my ($self) = @_; 2416 my ($self) = @_;
2270 2417
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2419
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2420 return if !$self->linkable;
2274 return if $self->{deny_save}; 2421 return if $self->{deny_save};
2275 return if $self->players; 2422 return if $self->players;
2276 2423
2277 # first deactivate the map and "unlink" it from the core 2424 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2425 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2427 $self->state (cf::MAP_SWAPPED);
2281 2428
2282 # then atomically save 2429 # then atomically save
2283 $self->_save; 2430 $self->_save;
2284 2431
2285 # then free the map 2432 # then free the map
2309 2456
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2458
2312 return if $self->players; 2459 return if $self->players;
2313 2460
2314 warn "resetting map ", $self->path, "\n"; 2461 cf::trace "resetting map ", $self->path, "\n";
2315 2462
2316 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2317 2464
2318 # need to save uniques path 2465 # need to save uniques path
2319 unless ($self->{deny_save}) { 2466 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2468
2583 2730
2584Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2585 2732
2586The player should be reasonably safe there for short amounts of time (e.g. 2733The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2735though, as the player cannot control the character while it is on the link
2589map. 2736map.
2590 2737
2591Will never block. 2738Will never block.
2592 2739
2593=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2614sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2615 my ($self) = @_; 2762 my ($self) = @_;
2616 2763
2617 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2618 2765
2766 ++$self->{_link_recursion};
2767
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2769
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2623 2772
2649 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2652 2801
2653 $map->load; 2802 $map->load;
2654 $map->load_neighbours;
2655 2803
2656 return unless $self->contr->active; 2804 return unless $self->contr->active;
2657 2805
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2660 2808 # entering was successful
2809 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2810 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2811 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again 2812 }
2664}
2665 2813
2814}
2815
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2817
2668Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
2678 2828
2679our $GOTOGEN; 2829our $GOTOGEN;
2680 2830
2681sub cf::object::player::goto { 2831sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2683 2839
2684 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2842
2687 $self->enter_link; 2843 $self->enter_link;
2707 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2708 } 2864 }
2709 } 2865 }
2710 2866
2711 my $map = eval { 2867 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2713 2869
2714 if ($map) { 2870 if ($map) {
2715 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2873 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2875 }
2720 2876
2721 $map 2877 $map
2729 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2732 } 2888 }
2733 2889
2734 $done->() if $done; 2890 $done->($self) if $done;
2735 })->prio (1); 2891 })->prio (1);
2736} 2892}
2737 2893
2738=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2739 2895
2807 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2808 2964
2809 unless (eval { 2965 unless (eval {
2810 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2811 2967
2812 # random map handling
2813 {
2814 my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816 prepare_random_map $exit
2817 if $exit->slaying eq "/!";
2818 }
2819
2820 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2821 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2822 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2823 2994
2824 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2825 2996
2826 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2827 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
2832 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2834 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2836 3007
2837 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 3009 $self->leave_link;
2839 } 3010 }
2840 })->prio (1); 3011 })->prio (1);
2841} 3012}
2842 3013
3052=cut 3223=cut
3053 3224
3054sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
3055 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
3056 3227
3057 if ($self->extcmd == 2) {
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3059 } elsif ($self->extcmd == 1) { # TODO: remove
3060 push @msg, msgtype => "event_$type";
3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3062 }
3063}
3064
3065=item $client->ext_reply ($msgid, @msg)
3066
3067Sends an ext reply to the client.
3068
3069=cut
3070
3071sub cf::client::ext_reply($$@) {
3072 my ($self, $id, @msg) = @_;
3073
3074 if ($self->extcmd == 2) {
3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3076 } elsif ($self->extcmd == 1) {
3077 #TODO: version 1, remove
3078 unshift @msg, msgtype => "reply", msgid => $id;
3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3080 }
3081} 3229}
3082 3230
3083=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
3084 3232
3085Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
3140 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3141 3289
3142 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3143 3291
3144 if (ref $msg) { 3292 if (ref $msg) {
3145 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3146 "ARRAY" eq ref $msg
3147 ? @$msg
3148 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3149 3294
3150 my @reply; 3295 my @reply;
3151 3296
3152 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3153 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3154 } 3299 }
3155 3300
3156 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3157 if $reply; 3302 if $reply;
3158 3303
3159 } else { 3304 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3306 }
3162 3307
3163 cf::override; 3308 cf::override;
3164 }, 3309 },
3165); 3310);
3246 decrease split destroy change_exp value msg lore send_msg)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3393 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3250) { 3395) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3398 for @funs;
3255} 3399}
3256 3400
3295 local @cf::_safe_eval_args = values %vars; 3439 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3440 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3441 }
3298 3442
3299 if ($@) { 3443 if ($@) {
3300 warn "$@"; 3444 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3303 } 3447 }
3304 3448
3305 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3306} 3450}
3307 3451
3332=cut 3476=cut
3333 3477
3334############################################################################# 3478#############################################################################
3335# the server's init and main functions 3479# the server's init and main functions
3336 3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3504
3337sub load_facedata($) { 3505sub load_facedata($) {
3338 my ($path) = @_; 3506 my ($path) = @_;
3339 3507
3340 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3341 # for this (global event?) 3509 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3511
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3513
3346 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3347 3515
3348 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3349 0 < aio_load $path, $facedata
3350 or die "$path: $!";
3351
3352 $facedata = Coro::Storable::thaw $facedata;
3353 3517
3354 $facedata->{version} == 2 3518 $facedata->{version} == 2
3355 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3356 3520
3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3359 $facedata->{resource}{"res/exp_table"} = {
3360 type => FT_RSRC,
3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3363 };
3364 cf::cede_to_tick; 3521 cf::cede_to_tick;
3365 3522
3366 { 3523 {
3367 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3368 3525
3369 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3370 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371 3529
3372 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3373 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3376 3536
3377 cf::cede_to_tick; 3537 cf::cede_to_tick;
3378 } 3538 }
3379 3539
3380 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3385 3545
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3549 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3551 }
3392 3552
3393 cf::cede_to_tick; 3553 cf::cede_to_tick;
3394 } 3554 }
3395 } 3555 }
3407 3567
3408 { 3568 {
3409 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3410 3570
3411 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3575
3576 cf::face::set_type $idx, $type;
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3417 } else { 3580 } else {
3418 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3419 } 3582 }
3420 3583
3421 cf::cede_to_tick; 3584 cf::cede_to_tick;
3422 } 3585 }
3423 } 3586 }
3424 3587
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3589
3427 1 3590 1
3428} 3591}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3592
3450register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3452 3595
3453 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3461 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3462 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3463 cf::arch::commit_load; 3606 cf::arch::commit_load;
3464 3607
3465 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3466} 3622}
3467 3623
3468sub reload_regions { 3624sub reload_regions {
3469 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3470 # for this (global event?) 3626 # for this (global event?)
3485} 3641}
3486 3642
3487sub reload_archetypes { 3643sub reload_archetypes {
3488 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3489 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3490} 3655}
3491 3656
3492sub reload_treasures { 3657sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3495} 3660}
3496 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3497sub reload_resources { 3744sub reload_resources {
3498 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3499 3746
3747 reload_materials;
3500 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3501 reload_archetypes; 3751 reload_archetypes;
3502 reload_regions; 3752 reload_regions;
3503 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3504 3755
3505 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3506} 3757}
3507 3758
3508sub reload_config { 3759sub reload_config {
3509 warn "reloading config file...\n"; 3760 trace "reloading config file...\n";
3510 3761
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3762 my $config = load_file "$CONFDIR/config";
3512 or return; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3513 3765
3514 local $/;
3515 *CFG = YAML::XS::Load scalar <$fh>;
3516
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3767
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3770
3522 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3773 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3774 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3775 };
3527 warn $@ if $@; 3776 warn $@ if $@;
3528 } 3777 }
3529
3530 warn "finished reloading resource files\n";
3531} 3778}
3532 3779
3533sub pidfile() { 3780sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3782 or die "$PIDFILE: $!";
3548 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3549 print $fh $$; 3796 print $fh $$;
3550} 3797}
3551 3798
3552sub main_loop { 3799sub main_loop {
3553 warn "EV::loop starting\n"; 3800 trace "EV::loop starting\n";
3554 if (1) { 3801 if (1) {
3555 EV::loop; 3802 EV::loop;
3556 } 3803 }
3557 warn "EV::loop returned\n"; 3804 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3805 goto &main_loop unless $REALLY_UNLOOP;
3559} 3806}
3560 3807
3561sub main { 3808sub main {
3562 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3563 3810
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3815
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3817
3571 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3572 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3574 (async { 3821 (async {
3575 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3576 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3577 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3578 }; 3825 };
3579 3826
3580 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3581 3828
3582 cf::sync_job { 3829 cf::sync_job {
3583 cf::init_experience; 3830 cf::incloader::init ();
3831
3832 db_init;
3833
3584 cf::init_anim; 3834 cf::init_anim;
3585 cf::init_attackmess; 3835 cf::init_attackmess;
3586 cf::init_dynamic; 3836 cf::init_dynamic;
3587 3837
3588 cf::load_settings; 3838 cf::load_settings;
3589 cf::load_materials;
3590 3839
3591 reload_resources; 3840 reload_resources;
3592 reload_config; 3841 reload_config;
3593 db_init;
3594 3842
3595 cf::init_uuid; 3843 cf::init_uuid;
3596 cf::init_signals; 3844 cf::init_signals;
3597 cf::init_skills; 3845 cf::init_skills;
3598 3846
3606 3854
3607 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX (); 3856 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610 3858
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3859 cf::_post_init 0;
3612 }; 3860 };
3613 3861
3614 cf::object::thawer::errors_are_fatal 0; 3862 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3863 info "parse errors in files are no longer fatal from this point on.\n";
3616 3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3617 main_loop; 3869 goto &main_loop;
3618} 3870}
3619 3871
3620############################################################################# 3872#############################################################################
3621# initialisation and cleanup 3873# initialisation and cleanup
3622 3874
3661 or return; 3913 or return;
3662 3914
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3916 and return;
3665 3917
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3919
3668 1 3920 1
3669} 3921}
3670 3922
3671our $uuid_lock; 3923our $uuid_lock;
3683 or return; 3935 or return;
3684 3936
3685 my $value = uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3686 3938
3687 unless ($value) { 3939 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3940 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3941 return;
3690 } 3942 }
3691 3943
3692 my $value = uuid_str $value + $uuid_skip; 3944 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3945 $uuid_skip = 0;
3703 or return; 3955 or return;
3704 3956
3705 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3706 and return; 3958 and return;
3707 3959
3708 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3709 3961
3710 1 3962 1
3711 3963
3712} 3964}
3713 3965
3719} 3971}
3720 3972
3721sub emergency_save() { 3973sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3723 3975
3724 warn "emergency_perl_save: enter\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3725 3982
3726 cf::sync_job { 3983 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 3984 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 3985
3732 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3992 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3994 $pl->save;
3741 } 3995 }
3742 warn "emergency_perl_save: end player save\n"; 3996 info "emergency_perl_save: end player save\n";
3743 3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
3744 warn "emergency_perl_save: begin map save\n"; 4000 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 4003 $map->valid or next;
3748 $map->save; 4004 $map->save;
3749 } 4005 }
3750 warn "emergency_perl_save: end map save\n"; 4006 info "emergency_perl_save: end map save\n";
3751 4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
3752 warn "emergency_perl_save: begin database checkpoint\n"; 4010 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3755 4013
3756 warn "emergency_perl_save: begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 4015 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 4036 };
3760 4037
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 4038 info "emergency_perl_save: leave\n";
3767} 4039}
3768 4040
3769sub post_cleanup { 4041sub post_cleanup {
3770 my ($make_core) = @_; 4042 my ($make_core) = @_;
3771 4043
4044 IO::AIO::flush;
4045
3772 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 4047 if $make_core;
3774 4048
3775 my $fh = pidfile; 4049 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3777} 4051}
3801 } 4075 }
3802} 4076}
3803 4077
3804sub do_reload_perl() { 4078sub do_reload_perl() {
3805 # can/must only be called in main 4079 # can/must only be called in main
3806 if (in_main) { 4080 unless (in_main) {
3807 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3808 return; 4082 return;
3809 } 4083 }
3810 4084
3811 return if $RELOAD++; 4085 return if $RELOAD++;
3812 4086
3813 my $t1 = AE::time; 4087 my $t1 = AE::time;
3814 4088
3815 while ($RELOAD) { 4089 while ($RELOAD) {
3816 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3817 4092
3818 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3819 4094
3820 cf::sync_job { 4095 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 4096 #cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 4097
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 4100 %EXT_CORO = ();
3838 4101
3839 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3840 %COMMAND = (); 4103 %COMMAND = ();
3841 4104
3842 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3843 %EXTCMD = (); 4106 %EXTCMD = ();
3844 %EXTICMD = (); 4107 %EXTICMD = ();
3845 4108
3846 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3849 4112
3850 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3851 eval { 4114 eval {
3852 $cb->($pkg); 4115 $cb->($pkg);
3853 1 4116 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3855 } 4118 }
3856 4119
3857 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3858 clear_package $pkg; 4121 clear_package $pkg;
3859 } 4122 }
3860 4123
3861 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 4127
3865 warn "... unloading $k"; 4128 trace "... unloading $k";
3866 delete $INC{$k}; 4129 delete $INC{$k};
3867 4130
3868 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3870 4133
3873 } 4136 }
3874 4137
3875 clear_package $k; 4138 clear_package $k;
3876 } 4139 }
3877 4140
3878 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 4142 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 4144
3882 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 4148
3886 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3887 # and global variables created in xs 4150 # and global variables created in xs
3888 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3889 4152
3890 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3891 4154
3892 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3893 require cf; 4156 require cf;
3894 cf::_connect_to_perl_1; 4157 cf::_connect_to_perl_1;
3895 4158
3896 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3897 cf::reload_config; 4160 cf::reload_config;
3898 4161
3899 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3900 cf::load_extensions; 4163 cf::load_extensions;
3901 4164
3902 if ($REATTACH_ON_RELOAD) { 4165 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3906 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
3909 } 4172 }
3910 4173
3911 warn "running post_init jobs"; 4174 cf::_post_init 1;
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913 4175
3914 warn "leaving sync_job"; 4176 trace "perl_reload: leaving sync_job";
3915 4177
3916 1 4178 1
3917 } or do { 4179 } or do {
3918 warn $@; 4180 error $@;
3919 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3920 }; 4182 };
3921 4183
3922 warn "reloaded";
3923 --$RELOAD; 4184 --$RELOAD;
3924 } 4185 }
3925 4186
3926 $t1 = AE::time - $t1; 4187 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 4188 info "perl_reload: completed in ${t1}s\n";
3928}; 4189};
3929 4190
3930our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3931 4192
3932sub reload_perl() { 4193sub reload_perl() {
3953 reload_perl; 4214 reload_perl;
3954 }; 4215 };
3955 } 4216 }
3956}; 4217};
3957 4218
3958unshift @INC, $LIBDIR; 4219#############################################################################
3959 4220
3960my $bug_warning = 0; 4221my $bug_warning = 0;
3961 4222
3962our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN;
3964
3965sub wait_for_tick { 4223sub wait_for_tick() {
3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3967 4225
3968 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3969 push @WAIT_FOR_TICK, $signal;
3970 $signal->wait;
3971} 4227}
3972 4228
3973sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3975 4231
3976 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3977 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3978 $signal->wait; 4234 $signal->wait;
3979} 4235}
3983 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3984 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3985 return; 4241 return;
3986 } 4242 }
3987 4243
3988 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
3989 4245
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3991 4247
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4250 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4252 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3998 }; 4254 };
3999 } 4255 }
4000 4256
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4258 $sig->send;
4003 } 4259 }
4004 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
4005 $sig->send;
4006 }
4007 4261
4008 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4010 4264
4011 if (0) { 4265 if (0) {
4012 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
4016 } 4270 }
4017 } 4271 }
4018} 4272}
4019 4273
4020{ 4274{
4021 # configure BDB 4275 # configure BDB
4276 info "initialising database";
4022 4277
4023 BDB::min_parallel 16; 4278 BDB::min_parallel 16;
4024 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
4025 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
4026 4281
4027 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
4028 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4030 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4055 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4056 }; 4311 };
4057 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4058 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4059 }; 4314 };
4315
4316 info "database initialised";
4060} 4317}
4061 4318
4062{ 4319{
4063 # configure IO::AIO 4320 # configure IO::AIO
4064 4321
4322 info "initialising aio";
4065 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
4066 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
4067 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
4068} 4327}
4069 4328
4070my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
4071 4331
4072sub _log_backtrace { 4332sub _log_backtrace {
4073 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
4074 4334
4075 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
4076 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
4078 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
4079 ++$_log_backtrace; 4343 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
4081 async { 4345 async {
4082 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
4083 4347
4103 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
4104 --$_log_backtrace; 4368 --$_log_backtrace;
4105 }; 4369 };
4106 } else { 4370 } else {
4107 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
4108 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109 } 4373 }
4110} 4374}
4111 4375
4112# load additional modules 4376# load additional modules
4113require "cf/$_.pm" for @EXTRA_MODULES; 4377require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines