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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 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;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d# 119our $VERBOSE_IO = 1;
118 120
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 123our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 135
133our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
135our $NOW; 139our $NOW;
136 140
137our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
148 152
149our @POST_INIT; 153our @POST_INIT;
150 154
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
153 160
154binmode STDOUT; 161binmode STDOUT;
155binmode STDERR; 162binmode STDERR;
156 163
157# read virtual server time, if available 164# read virtual server time, if available
… …
191 198
192=over 4 199=over 4
193 200
194=item $cf::UPTIME 201=item $cf::UPTIME
195 202
196The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
197 219
198=item $cf::RUNTIME 220=item $cf::RUNTIME
199 221
200The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 223every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
210database environment. 232database environment.
211 233
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 234=item $cf::LOADAVG
221 235
222The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 247from wherever your confdir points to.
234 248
235=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
236 250
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 252returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
240 271
241=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
242 273
243This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
252 283
253=back 284=back
254 285
255=cut 286=cut
256 287
288sub error(@) { LOG llevError, join "", @_ }
289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
257$Coro::State::WARNHOOK = sub { 294$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 295 my $msg = join "", @_;
259 296
260 $msg .= "\n" 297 $msg .= "\n"
261 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
262 299
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 301
265 LOG llevError, $msg; 302 LOG llevWarn, $msg;
266}; 303};
267 304
268$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
270 307
271 warn Carp::longmess $_[0]; 308 error Carp::longmess $_[0];
272 309
273 if (in_main) {#d# 310 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 312 return;#d#
276 }#d# 313 }#d#
277 314
278 # kill coroutine otherwise 315 # kill coroutine otherwise
279 Coro::terminate 316 Coro::terminate
… …
301} 338}
302 339
303$EV::DIED = sub { 340$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
305}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
306 348
307############################################################################# 349#############################################################################
308 350
309=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
310 352
… …
331 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
332 $d 374 $d
333 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
334} 376}
335 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
336=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
337 431
338Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
339 433
340=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347 441
348sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
350 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
351=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
352 477
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
355 480
356The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 482is a reload or not.
358 483
359=cut 484=cut
360 485
361sub post_init(&) { 486sub post_init(&) {
362 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
363} 505}
364 506
365=item cf::lock_wait $string 507=item cf::lock_wait $string
366 508
367Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
420 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
421} 563}
422 564
423=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
424 566
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
426This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
427of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
428 574
429The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
430used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
431 577
432Useful for short background jobs. 578Useful for short background jobs.
… …
461 } 607 }
462 } 608 }
463 609
464 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
465 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
466 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
467 $signal->wait;
468 } else { 613 } else {
469 $busy = 0; 614 $busy = 0;
470 Coro::schedule; 615 Coro::schedule;
471 } 616 }
472 } 617 }
… …
512=cut 657=cut
513 658
514sub sync_job(&) { 659sub sync_job(&) {
515 my ($job) = @_; 660 my ($job) = @_;
516 661
517 if ($Coro::current == $Coro::main) { 662 if (in_main) {
518 my $time = AE::time; 663 my $time = AE::time;
519 664
520 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
522 667
523 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
524 669
525 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
526 671
527 my $busy = 1; 672 my $busy = 1;
528 my @res; 673 my @res;
529 674
530 (async { 675 (async {
531 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 677 @res = eval { $job->() };
533 warn $@ if $@; 678 error $@ if $@;
534 undef $busy; 679 undef $busy;
535 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
536 681
537 while ($busy) { 682 while ($busy) {
538 if (Coro::nready) { 683 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
573 718
574 $coro 719 $coro
575} 720}
576 721
577=item fork_call { }, $args 722=item fork_call { }, @args
578 723
579Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 727never block itself or use any form of event handling.
583 728
584=cut 729=cut
585 730
731sub post_fork {
732 reset_signals;
733}
734
586sub fork_call(&@) { 735sub fork_call(&@) {
587 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
588 737
589 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
590 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
592 741
593 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
594 reset_signals; 743 cf::post_fork;
595 &$cb 744 &$cb
596 }, @args; 745 } @args;
597 746
598 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
599} 748}
600 749
601sub objinfo { 750sub objinfo {
… …
651within each server. 800within each server.
652 801
653=cut 802=cut
654 803
655sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
656 my ($name) = @_; 808 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
658 810
659 eval { 811 eval {
660 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
… …
670} 822}
671 823
672our $DB; 824our $DB;
673 825
674sub db_init { 826sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
677 };
678} 828}
679 829
680sub db_get($$) { 830sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
682 832
683 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
684 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
685 837
686 $! ? () 838 $! ? ()
687 : $data 839 : $data
688 }
689} 840}
690 841
691sub db_put($$$) { 842sub db_put($$$) {
692 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 872
722 my @data; 873 my @data;
723 my $md5; 874 my $md5;
724 875
725 for (0 .. $#$src) { 876 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 878 }
729 879
730 # if processing is expensive, check 880 # if processing is expensive, check
731 # checksum first 881 # checksum first
732 if (1) { 882 if (1) {
… …
749 899
750 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 901 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
753 903
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 905
756 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
759 909
… …
769 919
770=cut 920=cut
771 921
772sub datalog($@) { 922sub datalog($@) {
773 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 925}
776 926
777=back 927=back
778 928
779=cut 929=cut
… …
974 1124
975 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1127
978 } elsif (ref $type) { 1128 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
980 1130
981 } else { 1131 } else {
982 shift @arg; 1132 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
984 } 1134 }
985 } 1135 }
986} 1136}
987 1137
988sub _object_attach { 1138sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
999 } 1149 }
1000 1150
1001 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
1002 } else { 1152 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1154 }
1005 1155
1006 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
1007} 1157}
1008 1158
… …
1067 1217
1068 for (@$callbacks) { 1218 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1070 1220
1071 if ($@) { 1221 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1223 override;
1075 } 1224 }
1076 1225
1077 return 1 if $override; 1226 return 1 if $override;
1078 } 1227 }
… …
1157 for (@$attach) { 1306 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1160 } 1309 }
1161 } else { 1310 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1312 }
1164 } 1313 }
1165} 1314}
1166 1315
1167cf::attachable->attach ( 1316cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1195 1344
1196 sync_job { 1345 sync_job {
1197 if (length $$rdata) { 1346 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1349 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1350 if $VERBOSE_IO;
1202 1351
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1229 1378
1230 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1381 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1234 } 1383 }
1235 } else { 1384 } else {
1236 aio_unlink $filename; 1385 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1238 } 1387 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1412 $av = $st->{objs};
1264 } 1413 }
1265 1414
1266 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1417 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1418 if $VERBOSE_IO;
1270 1419
1271 ($data, $av) 1420 ($data, $av)
1272} 1421}
1273 1422
… …
1351 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1352 1501
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1503
1355 if (ref $msg) { 1504 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1506
1361 my @reply; 1507 my @reply;
1362 1508
1363 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1364 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1366 1512
1367 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1514 if $reply;
1369 1515
1370 } else { 1516 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1518 }
1373 1519
1374 cf::override; 1520 cf::override;
1375 }, 1521 },
1376); 1522);
… …
1386 }; 1532 };
1387 1533
1388 $grp 1534 $grp
1389} 1535}
1390 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1391sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1392 cf::sync_job { 1553 cf::sync_job {
1393 my %todo; 1554 my %todo;
1394 1555
1395 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1557 next unless -r $path;
… …
1414 1575
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1578
1418 $ext{source} = 1579 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1421 . $source 1582 . $source
1422 . "\n};\n1"; 1583 . "\n};\n1";
1423 1584
1424 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1598 next ext
1438 unless exists $done{$_}; 1599 unless exists $done{$_};
1439 } 1600 }
1440 1601
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1443 my $active = eval $v->{source}; 1613 my $active = eval $source;
1444 1614
1445 if (length $@) { 1615 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1447 1617
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1619 if exists $v->{meta}{mandatory};
1450 1620
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1623 } else {
1454 $done{$k} = delete $todo{$k}; 1624 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1625 push @EXTS, $v->{pkg};
1456 $progress = 1; 1626 $progress = 1;
1457 1627
1458 warn "$v->{base}: extension inactive.\n" 1628 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1629 unless $active;
1460 } 1630 }
1461 } 1631 }
1462 1632
1463 unless ($progress) { 1633 unless ($progress) {
… …
1465 1635
1466 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1469 } 1639 }
1640
1641 last;
1470 } 1642 }
1471 } 1643 }
1472 }; 1644 };
1473} 1645}
1474 1646
… …
1632 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1633 1805
1634 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1636 1808
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1810 $pl->deactivate;
1811
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1642 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1643 1817
1644 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1812sub generate_random_map { 1986sub generate_random_map {
1813 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1814 1988
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816 1990
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 1992}
1832 1993
1833=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1834 1995
1835Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
… …
1840 2001
1841sub register { 2002sub register {
1842 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 2004 my $pkg = caller;
1844 2005
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 2007
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 2009}
1850 2010
… …
1862} 2022}
1863 2023
1864sub normalise { 2024sub normalise {
1865 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1866 2026
1867 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1868 2028
1869 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1870 2030
1871 # map plan: 2031 # map plan:
1872 # 2032 #
… …
1887 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 2048 $path = "$base/$path";
1889 } 2049 }
1890 2050
1891 for ($path) { 2051 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1895 } 2054 }
1896 2055
1897 $path 2056 $path
… …
1911 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1912 return $self; 2071 return $self;
1913 } 2072 }
1914 } 2073 }
1915 2074
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 2076 ()
1918} 2077}
1919 2078
2079# may re-bless or do other evil things
1920sub init { 2080sub init {
1921 my ($self) = @_; 2081 my ($self) = @_;
1922 2082
1923 $self 2083 $self
1924} 2084}
… …
1989 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1990 2150
1991 1 2151 1
1992} 2152}
1993 2153
2154# used to laod the header of an original map
1994sub load_header_orig { 2155sub load_header_orig {
1995 my ($self) = @_; 2156 my ($self) = @_;
1996 2157
1997 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1998} 2159}
1999 2160
2161# used to laod the header of an instantiated map
2000sub load_header_temp { 2162sub load_header_temp {
2001 my ($self) = @_; 2163 my ($self) = @_;
2002 2164
2003 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2004} 2166}
2005 2167
2168# called after loading the header from an instantiated map
2006sub prepare_temp { 2169sub prepare_temp {
2007 my ($self) = @_; 2170 my ($self) = @_;
2008 2171
2009 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2010 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2011 # safety 2174 # safety
2012 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2013 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2014} 2177}
2015 2178
2179# called after loading the header from an original map
2016sub prepare_orig { 2180sub prepare_orig {
2017 my ($self) = @_; 2181 my ($self) = @_;
2018 2182
2019 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2020 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2044 2208
2045sub find; 2209sub find;
2046sub find { 2210sub find {
2047 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2048 2212
2213 cf::cede_to_tick;
2214
2049 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2050 2216
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2053 2219
2054 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2085 2251
2086 { 2252 {
2087 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2088 2254
2089 return unless $self->valid; 2255 return unless $self->valid;
2090 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2091
2092 $self->in_memory (cf::MAP_LOADING);
2093 2257
2094 $self->alloc; 2258 $self->alloc;
2095 2259
2096 $self->pre_load; 2260 $self->pre_load;
2097 cf::cede_to_tick; 2261 cf::cede_to_tick;
2098 2262
2263 if (exists $self->{load_path}) {
2099 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2100 $f->skip_block; 2265 $f->skip_block;
2101 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2102 or return; 2267 or return;
2103 2268
2104 $self->post_load_original 2269 $self->post_load_original
2105 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2106 2271
2107 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2108 utf8::encode $uniq; 2273 utf8::encode $uniq;
2109 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2110 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2111 $self->clear_unique_items; 2276 $self->clear_unique_items;
2112 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2113 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2114 } 2280 }
2115 } 2281 }
2116 }
2117 2282
2118 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2119 2290
2120 cf::cede_to_tick; 2291 cf::cede_to_tick;
2121 # now do the right thing for maps 2292 # now do the right thing for maps
2122 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2123 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2127 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2128 $self->decay_objects; 2299 $self->decay_objects;
2129 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2130 $self->update_buttons; 2301 $self->update_buttons;
2131 cf::cede_to_tick; 2302 cf::cede_to_tick;
2132 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2133 } 2304 }
2134 2305
2135 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2136 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2137
2138 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2308 }
2140 2309
2141 $self->post_load; 2310 $self->post_load;
2311
2312 1
2142} 2313}
2143 2314
2144# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2154# if $self->per_party; 2325# if $self->per_party;
2155 2326
2156 $self 2327 $self
2157} 2328}
2158 2329
2159# find and load all maps in the 3x3 area around a map
2160sub load_neighbours {
2161 my ($map) = @_;
2162
2163 my @neigh; # diagonal neighbours
2164
2165 for (0 .. 3) {
2166 my $neigh = $map->tile_path ($_)
2167 or next;
2168 $neigh = find $neigh, $map
2169 or next;
2170 $neigh->load;
2171
2172 # now find the diagonal neighbours
2173 push @neigh,
2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2176 }
2177
2178 for (grep defined $_->[0], @neigh) {
2179 my ($path, $origin) = @$_;
2180 my $neigh = find $path, $origin
2181 or next;
2182 $neigh->load;
2183 }
2184}
2185
2186sub find_sync { 2330sub find_sync {
2187 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2188 2332
2189 cf::sync_job { find $path, $origin } 2333 # it's a bug to call this from the main context
2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2335 if $Coro::current == $Coro::main;
2336
2337 find $path, $origin
2190} 2338}
2191 2339
2192sub do_load_sync { 2340sub do_load_sync {
2193 my ($map) = @_; 2341 my ($map) = @_;
2194 2342
2343 # it's a bug to call this from the main context
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2197 2346
2198 cf::sync_job { $map->load }; 2347 $map->load;
2199} 2348}
2200 2349
2201our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2203 2352
2204sub find_async { 2353sub find_async {
2205 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2206 2355
2207 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2208 2357
2209 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2211 } 2360 }
2212 2361
2213 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2214 2363
2215 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2274sub swap_out { 2423sub swap_out {
2275 my ($self) = @_; 2424 my ($self) = @_;
2276 2425
2277 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2278 2427
2279 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2280 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2281 return if $self->players; 2430 return if $self->players;
2282 2431
2283 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate; 2433 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2286 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2287 2436
2288 # then atomically save 2437 # then atomically save
2289 $self->_save; 2438 $self->_save;
2290 2439
2291 # then free the map 2440 # then free the map
… …
2315 2464
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2466
2318 return if $self->players; 2467 return if $self->players;
2319 2468
2320 warn "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2321 2470
2322 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2323 2472
2324 # need to save uniques path 2473 # need to save uniques path
2325 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327 2476
… …
2657 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2658 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2659 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2660 2809
2661 $map->load; 2810 $map->load;
2662 $map->load_neighbours;
2663 2811
2664 return unless $self->contr->active; 2812 return unless $self->contr->active;
2665 2813
2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2690 2838
2691sub cf::object::player::goto { 2839sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2841
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2846 }
2699 2847
2700 # do generation counting so two concurrent goto's will be executed in-order 2848 # do generation counting so two concurrent goto's will be executed in-order
… …
2723 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2724 } 2872 }
2725 } 2873 }
2726 2874
2727 my $map = eval { 2875 my $map = eval {
2728 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729 2877
2730 if ($map) { 2878 if ($map) {
2731 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2732 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2733 } else { 2881 } else {
… …
2823 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2824 2972
2825 unless (eval { 2973 unless (eval {
2826 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2827 2975
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2837 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2839 3002
2840 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2841 3004
2842 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2848 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 3012 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2852 3015
2853 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 3017 $self->leave_link;
2855 } 3018 }
2856 })->prio (1); 3019 })->prio (1);
2857} 3020}
2858 3021
… …
3085=cut 3248=cut
3086 3249
3087sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3088 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3089 3252
3090 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092 } elsif ($self->extcmd == 1) {
3093 #TODO: version 1, remove
3094 unshift @msg, msgtype => "reply", msgid => $id;
3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096 }
3097} 3256}
3098 3257
3099=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3100 3259
3101Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3156 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3157 3316
3158 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159 3318
3160 if (ref $msg) { 3319 if (ref $msg) {
3161 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162 "ARRAY" eq ref $msg
3163 ? @$msg
3164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165 3321
3166 my @reply; 3322 my @reply;
3167 3323
3168 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3169 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3171 3327
3172 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3173 if $reply; 3329 if $reply;
3174 3330
3175 } else { 3331 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3333 }
3178 3334
3179 cf::override; 3335 cf::override;
3180 }, 3336 },
3181); 3337);
… …
3262 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3266) { 3422) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3425 for @funs;
3271} 3426}
3272 3427
… …
3311 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3468 }
3314 3469
3315 if ($@) { 3470 if ($@) {
3316 warn "$@"; 3471 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3319 } 3474 }
3320 3475
3321 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3322} 3477}
3323 3478
… …
3357 # for this (global event?) 3512 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3359 3514
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3516
3362 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3363 3518
3364 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3365 0 < aio_load $path, $facedata
3366 or die "$path: $!";
3367
3368 $facedata = Coro::Storable::thaw $facedata;
3369 3520
3370 $facedata->{version} == 2 3521 $facedata->{version} == 2
3371 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3372 3523
3373 # patch in the exptable 3524 # patch in the exptable
… …
3387 3538
3388 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3542 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3543 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3392 3544
3393 cf::cede_to_tick; 3545 cf::cede_to_tick;
3394 } 3546 }
3395 3547
3396 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3401 3553
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3557 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3559 }
3408 3560
3409 cf::cede_to_tick; 3561 cf::cede_to_tick;
3410 } 3562 }
3411 } 3563 }
… …
3423 3575
3424 { 3576 {
3425 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3426 3578
3427 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3428 if (defined $info->{type}) { 3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3583
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3585 cf::face::set_type $idx, $type;
3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3433 } else { 3587 } else {
3434 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3435 } 3589 }
3436 3590
3437 cf::cede_to_tick; 3591 cf::cede_to_tick;
3438 } 3592 }
3439 } 3593 }
3440 3594
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3596
3443 1 3597 1
3444} 3598}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3599
3466register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3468 3602
3469 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3508sub reload_treasures { 3642sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3511} 3645}
3512 3646
3647sub reload_sound {
3648 trace "loading sound config from $DATADIR/sound\n";
3649
3650 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3651
3652 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3653 my $sound = $soundconf->{compat}[$_]
3654 or next;
3655
3656 my $face = cf::face::find "sound/$sound->[1]";
3657 cf::sound::set $sound->[0] => $face;
3658 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3659 }
3660
3661 while (my ($k, $v) = each %{$soundconf->{event}}) {
3662 my $face = cf::face::find "sound/$v";
3663 cf::sound::set $k => $face;
3664 }
3665}
3666
3513sub reload_resources { 3667sub reload_resources {
3514 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3515 3669
3670 reload_exp_table;
3671 reload_materials;
3516 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3517 reload_archetypes; 3674 reload_archetypes;
3518 reload_regions; 3675 reload_regions;
3519 reload_treasures; 3676 reload_treasures;
3520 3677
3521 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3522} 3679}
3523 3680
3524sub reload_config { 3681sub reload_config {
3525 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3526 3683
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3528 or return; 3685 utf8::decode $config;
3529 3686 *CFG = decode_yaml $config;
3530 local $/;
3531 *CFG = YAML::XS::Load scalar <$fh>;
3532 3687
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3689
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3690 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3691 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3697 };
3543 warn $@ if $@; 3698 warn $@ if $@;
3544 } 3699 }
3545
3546 warn "finished reloading resource files\n";
3547} 3700}
3548 3701
3549sub pidfile() { 3702sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3564 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3565 print $fh $$; 3718 print $fh $$;
3566} 3719}
3567 3720
3568sub main_loop { 3721sub main_loop {
3569 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3570 if (1) { 3723 if (1) {
3571 EV::loop; 3724 EV::loop;
3572 } 3725 }
3573 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3575} 3728}
3576 3729
3577sub main { 3730sub main {
3578 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3579 3732
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3734 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3737
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3738 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3739
… …
3594 }; 3747 };
3595 3748
3596 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3597 3750
3598 cf::sync_job { 3751 cf::sync_job {
3599 cf::init_experience; 3752 cf::incloader::init ();
3753
3600 cf::init_anim; 3754 cf::init_anim;
3601 cf::init_attackmess; 3755 cf::init_attackmess;
3602 cf::init_dynamic; 3756 cf::init_dynamic;
3603 3757
3604 cf::load_settings; 3758 cf::load_settings;
3605 cf::load_materials;
3606 3759
3607 reload_resources; 3760 reload_resources;
3608 reload_config; 3761 reload_config;
3609 db_init; 3762 db_init;
3610 3763
… …
3622 3775
3623 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3777 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3778 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3779
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3628 }; 3781 };
3629 3782
3630 cf::object::thawer::errors_are_fatal 0; 3783 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3784 info "parse errors in files are no longer fatal from this point on.\n";
3632 3785
3786 AE::postpone {
3787 undef &main; # free gobs of memory :)
3788 };
3789
3633 main_loop; 3790 goto &main_loop;
3634} 3791}
3635 3792
3636############################################################################# 3793#############################################################################
3637# initialisation and cleanup 3794# initialisation and cleanup
3638 3795
… …
3677 or return; 3834 or return;
3678 3835
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3837 and return;
3681 3838
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3840
3684 1 3841 1
3685} 3842}
3686 3843
3687our $uuid_lock; 3844our $uuid_lock;
… …
3699 or return; 3856 or return;
3700 3857
3701 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3702 3859
3703 unless ($value) { 3860 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3862 return;
3706 } 3863 }
3707 3864
3708 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3719 or return; 3876 or return;
3720 3877
3721 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3722 and return; 3879 and return;
3723 3880
3724 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3725 3882
3726 1 3883 1
3727 3884
3728} 3885}
3729 3886
… …
3735} 3892}
3736 3893
3737sub emergency_save() { 3894sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3739 3896
3740 warn "emergency_perl_save: enter\n"; 3897 info "emergency_perl_save: enter\n";
3898
3899 # this is a trade-off: we want to be very quick here, so
3900 # save all maps without fsync, and later call a global sync
3901 # (which in turn might be very very slow)
3902 local $USE_FSYNC = 0;
3741 3903
3742 cf::sync_job { 3904 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 3906
3748 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 3913 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 3915 $pl->save;
3757 } 3916 }
3758 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3759 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3760 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 3924 $map->valid or next;
3764 $map->save; 3925 $map->save;
3765 } 3926 }
3766 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3767 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3768 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3771 3934
3772 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 3936 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 3937 info "emergency_perl_save: end write uuid\n";
3938
3939 cf::write_runtime_sync; # external watchdog should not bark
3940
3941 trace "emergency_perl_save: syncing database to disk";
3942 BDB::db_env_txn_checkpoint $DB_ENV;
3943
3944 info "emergency_perl_save: starting sync\n";
3945 IO::AIO::aio_sync sub {
3946 info "emergency_perl_save: finished sync\n";
3947 };
3948
3949 cf::write_runtime_sync; # external watchdog should not bark
3950
3951 trace "emergency_perl_save: flushing outstanding aio requests";
3952 while (IO::AIO::nreqs || BDB::nreqs) {
3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3954 }
3955
3956 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 3957 };
3776 3958
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3783} 3960}
3784 3961
3785sub post_cleanup { 3962sub post_cleanup {
3786 my ($make_core) = @_; 3963 my ($make_core) = @_;
3787 3964
3965 IO::AIO::flush;
3966
3788 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 3968 if $make_core;
3790 3969
3791 my $fh = pidfile; 3970 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3793} 3972}
… …
3817 } 3996 }
3818} 3997}
3819 3998
3820sub do_reload_perl() { 3999sub do_reload_perl() {
3821 # can/must only be called in main 4000 # can/must only be called in main
3822 if (in_main) { 4001 unless (in_main) {
3823 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3824 return; 4003 return;
3825 } 4004 }
3826 4005
3827 return if $RELOAD++; 4006 return if $RELOAD++;
3828 4007
3829 my $t1 = AE::time; 4008 my $t1 = AE::time;
3830 4009
3831 while ($RELOAD) { 4010 while ($RELOAD) {
3832 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3833 4013
3834 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3835 4015
3836 cf::sync_job { 4016 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 4017 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 4018
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 4021 %EXT_CORO = ();
3854 4022
3855 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3856 %COMMAND = (); 4024 %COMMAND = ();
3857 4025
3858 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 4027 %EXTCMD = ();
3860 %EXTICMD = (); 4028 %EXTICMD = ();
3861 4029
3862 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3865 4033
3866 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3867 eval { 4035 eval {
3868 $cb->($pkg); 4036 $cb->($pkg);
3869 1 4037 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3871 } 4039 }
3872 4040
3873 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3874 clear_package $pkg; 4042 clear_package $pkg;
3875 } 4043 }
3876 4044
3877 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 4048
3881 warn "... unloading $k"; 4049 trace "... unloading $k";
3882 delete $INC{$k}; 4050 delete $INC{$k};
3883 4051
3884 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3886 4054
… …
3889 } 4057 }
3890 4058
3891 clear_package $k; 4059 clear_package $k;
3892 } 4060 }
3893 4061
3894 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 4063 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4064 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 4065
3898 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 4069
3902 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3903 # and global variables created in xs 4071 # and global variables created in xs
3904 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3905 4073
3906 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3907 4075
3908 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3909 require cf; 4077 require cf;
3910 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3911 4079
3912 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 4081 cf::reload_config;
3914 4082
3915 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 4084 cf::load_extensions;
3917 4085
3918 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3925 } 4093 }
3926 4094
3927 warn "running post_init jobs"; 4095 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 4096
3930 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3931 4098
3932 1 4099 1
3933 } or do { 4100 } or do {
3934 warn $@; 4101 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4103 };
3937 4104
3938 warn "reloaded";
3939 --$RELOAD; 4105 --$RELOAD;
3940 } 4106 }
3941 4107
3942 $t1 = AE::time - $t1; 4108 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3944}; 4110};
3945 4111
3946our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3947 4113
3948sub reload_perl() { 4114sub reload_perl() {
… …
3969 reload_perl; 4135 reload_perl;
3970 }; 4136 };
3971 } 4137 }
3972}; 4138};
3973 4139
3974unshift @INC, $LIBDIR; 4140#############################################################################
3975 4141
3976my $bug_warning = 0; 4142my $bug_warning = 0;
3977 4143
3978our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN;
3980
3981sub wait_for_tick { 4144sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983 4146
3984 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3985 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait;
3987} 4148}
3988 4149
3989sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991 4152
3992 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4155 $signal->wait;
3995} 4156}
… …
3999 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4160 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
4001 return; 4162 return;
4002 } 4163 }
4003 4164
4004 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
4005 4166
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007 4168
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4171 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4173 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
4014 }; 4175 };
4015 } 4176 }
4016 4177
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4179 $sig->send;
4019 } 4180 }
4020 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
4021 $sig->send;
4022 }
4023 4182
4024 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
4025 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026 4185
4027 if (0) { 4186 if (0) {
4028 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
4032 } 4191 }
4033 } 4192 }
4034} 4193}
4035 4194
4036{ 4195{
4037 # configure BDB 4196 # configure BDB
4038 4197
4039 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
4040 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
4041 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
4042 4201
4043 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
4044 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4081 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4084} 4243}
4085 4244
4086my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4087 4247
4088sub _log_backtrace { 4248sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4090 4250
4091 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4092 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4259 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4097 async { 4261 async {
4098 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4099 4263
… …
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4284 --$_log_backtrace;
4121 }; 4285 };
4122 } else { 4286 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4289 }
4126} 4290}
4127 4291
4128# load additional modules 4292# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines