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.514 by root, Mon Apr 12 17:13:36 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 = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 135
130our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
132our $NOW; 139our $NOW;
133 140
134our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
145 152
146our @POST_INIT; 153our @POST_INIT;
147 154
148our $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)
149our $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;
150 160
151binmode STDOUT; 161binmode STDOUT;
152binmode STDERR; 162binmode STDERR;
153 163
154# read virtual server time, if available 164# read virtual server time, if available
… …
165 175
166our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
167 177
168sub cf::map::normalise; 178sub cf::map::normalise;
169 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
170############################################################################# 184#############################################################################
171 185
172%REFLECT = (); 186%REFLECT = ();
173for (@REFLECT) { 187for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 188 my $reflect = JSON::XS::decode_json $_;
… …
184 198
185=over 4 199=over 4
186 200
187=item $cf::UPTIME 201=item $cf::UPTIME
188 202
189The 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.
190 219
191=item $cf::RUNTIME 220=item $cf::RUNTIME
192 221
193The 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
194every server tick. 223every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
203database environment. 232database environment.
204 233
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 234=item $cf::LOADAVG
214 235
215The 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
216(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
217objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 247from wherever your confdir points to.
227 248
228=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
229 250
230These 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
231returns 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
232per 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();
233 271
234=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
235 273
236This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 283
246=back 284=back
247 285
248=cut 286=cut
249 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
250$Coro::State::WARNHOOK = sub { 294$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 295 my $msg = join "", @_;
252 296
253 $msg .= "\n" 297 $msg .= "\n"
254 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
255 299
256 $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;
257 301
258 LOG llevError, $msg; 302 LOG llevWarn, $msg;
259}; 303};
260 304
261$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
263 307
264 warn Carp::longmess $_[0]; 308 error Carp::longmess $_[0];
265 309
266 if ($Coro::current == $Coro::main) {#d# 310 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 312 return;#d#
269 }#d# 313 }#d#
270 314
271 # kill coroutine otherwise 315 # kill coroutine otherwise
272 Coro::terminate 316 Coro::terminate
… …
294} 338}
295 339
296$EV::DIED = sub { 340$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
298}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
299 348
300############################################################################# 349#############################################################################
301 350
302=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
303 352
… …
324 $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;
325 $d 374 $d
326 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
327} 376}
328 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
329=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
330 431
331Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
332 433
333=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
339our $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
340 441
341sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
345 477
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
348 480
349The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 482is a reload or not.
351 483
352=cut 484=cut
353 485
354sub post_init(&) { 486sub post_init(&) {
355 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 }
356} 505}
357 506
358=item cf::lock_wait $string 507=item cf::lock_wait $string
359 508
360Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
413 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
414} 563}
415 564
416=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
417 566
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
419This 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
420of 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.
421 574
422The 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
423used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
424 577
425Useful for short background jobs. 578Useful for short background jobs.
… …
454 } 607 }
455 } 608 }
456 609
457 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
458 # 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
459 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 613 } else {
462 $busy = 0; 614 $busy = 0;
463 Coro::schedule; 615 Coro::schedule;
464 } 616 }
465 } 617 }
… …
505=cut 657=cut
506 658
507sub sync_job(&) { 659sub sync_job(&) {
508 my ($job) = @_; 660 my ($job) = @_;
509 661
510 if ($Coro::current == $Coro::main) { 662 if (in_main) {
511 my $time = AE::time; 663 my $time = AE::time;
512 664
513 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
515 667
516 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
517 669
518 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
519 671
520 my $busy = 1; 672 my $busy = 1;
521 my @res; 673 my @res;
522 674
523 (async { 675 (async {
524 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 677 @res = eval { $job->() };
526 warn $@ if $@; 678 error $@ if $@;
527 undef $busy; 679 undef $busy;
528 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
529 681
530 while ($busy) { 682 while ($busy) {
531 if (Coro::nready) { 683 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
566 718
567 $coro 719 $coro
568} 720}
569 721
570=item fork_call { }, $args 722=item fork_call { }, @args
571 723
572Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 727never block itself or use any form of event handling.
576 728
577=cut 729=cut
578 730
731sub post_fork {
732 reset_signals;
733}
734
579sub fork_call(&@) { 735sub fork_call(&@) {
580 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
581 737
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
585 741
586 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
587 reset_signals; 743 cf::post_fork;
588 &$cb 744 &$cb
589 }, @args; 745 } @args;
590 746
591 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
592} 748}
593 749
594sub objinfo { 750sub objinfo {
… …
644within each server. 800within each server.
645 801
646=cut 802=cut
647 803
648sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
649 my ($name) = @_; 808 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
651 810
652 eval { 811 eval {
653 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
… …
663} 822}
664 823
665our $DB; 824our $DB;
666 825
667sub db_init { 826sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
670 };
671} 828}
672 829
673sub db_get($$) { 830sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
675 832
676 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
677 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
678 837
679 $! ? () 838 $! ? ()
680 : $data 839 : $data
681 }
682} 840}
683 841
684sub db_put($$$) { 842sub db_put($$$) {
685 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 872
715 my @data; 873 my @data;
716 my $md5; 874 my $md5;
717 875
718 for (0 .. $#$src) { 876 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 878 }
722 879
723 # if processing is expensive, check 880 # if processing is expensive, check
724 # checksum first 881 # checksum first
725 if (1) { 882 if (1) {
… …
742 899
743 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 901 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
746 903
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 905
749 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
752 909
… …
762 919
763=cut 920=cut
764 921
765sub datalog($@) { 922sub datalog($@) {
766 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 925}
769 926
770=back 927=back
771 928
772=cut 929=cut
… …
967 1124
968 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1127
971 } elsif (ref $type) { 1128 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
973 1130
974 } else { 1131 } else {
975 shift @arg; 1132 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
977 } 1134 }
978 } 1135 }
979} 1136}
980 1137
981sub _object_attach { 1138sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
992 } 1149 }
993 1150
994 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
995 } else { 1152 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1154 }
998 1155
999 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
1000} 1157}
1001 1158
… …
1060 1217
1061 for (@$callbacks) { 1218 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1063 1220
1064 if ($@) { 1221 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1223 override;
1068 } 1224 }
1069 1225
1070 return 1 if $override; 1226 return 1 if $override;
1071 } 1227 }
… …
1150 for (@$attach) { 1306 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1153 } 1309 }
1154 } else { 1310 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1312 }
1157 } 1313 }
1158} 1314}
1159 1315
1160cf::attachable->attach ( 1316cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1188 1344
1189 sync_job { 1345 sync_job {
1190 if (length $$rdata) { 1346 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1194 1351
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1355 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1221 1378
1222 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1381 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1226 } 1383 }
1227 } else { 1384 } else {
1228 aio_unlink $filename; 1385 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1230 } 1387 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1412 $av = $st->{objs};
1256 } 1413 }
1257 1414
1258 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1261 1419
1262 ($data, $av) 1420 ($data, $av)
1263} 1421}
1264 1422
1265=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
… …
1342 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1343 1501
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1503
1346 if (ref $msg) { 1504 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1506
1352 my @reply; 1507 my @reply;
1353 1508
1354 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1355 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1357 1512
1358 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1514 if $reply;
1360 1515
1361 } else { 1516 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1518 }
1364 1519
1365 cf::override; 1520 cf::override;
1366 }, 1521 },
1367); 1522);
… …
1377 }; 1532 };
1378 1533
1379 $grp 1534 $grp
1380} 1535}
1381 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
1382sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1383 cf::sync_job { 1553 cf::sync_job {
1384 my %todo; 1554 my %todo;
1385 1555
1386 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1557 next unless -r $path;
… …
1405 1575
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1578
1409 $ext{source} = 1579 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1412 . $source 1582 . $source
1413 . "\n};\n1"; 1583 . "\n};\n1";
1414 1584
1415 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1598 next ext
1429 unless exists $done{$_}; 1599 unless exists $done{$_};
1430 } 1600 }
1431 1601
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 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
1434 my $active = eval $v->{source}; 1613 my $active = eval $source;
1435 1614
1436 if (length $@) { 1615 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1438 1617
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1619 if exists $v->{meta}{mandatory};
1620
1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1441 } else { 1623 } else {
1442 $done{$k} = delete $todo{$k}; 1624 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1625 push @EXTS, $v->{pkg};
1444 $progress = 1; 1626 $progress = 1;
1445 1627
1446 warn "$v->{base}: extension inactive.\n" 1628 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1629 unless $active;
1448 } 1630 }
1449 } 1631 }
1450 1632
1451 unless ($progress) { 1633 unless ($progress) {
… …
1453 1635
1454 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1457 } 1639 }
1640
1641 last;
1458 } 1642 }
1459 } 1643 }
1460 }; 1644 };
1461} 1645}
1462 1646
… …
1620 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1621 1805
1622 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1623 $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
1624 1808
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1810 $pl->deactivate;
1811
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1630 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1631 1817
1632 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1688 \@logins 1874 \@logins
1689} 1875}
1690 1876
1691=item $player->maps 1877=item $player->maps
1692 1878
1879=item cf::player::maps $login
1880
1693Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1694player. May block. 1882player. May block.
1695 1883
1696=cut 1884=cut
1697 1885
… …
1759=cut 1947=cut
1760 1948
1761sub find_by_path($) { 1949sub find_by_path($) {
1762 my ($path) = @_; 1950 my ($path) = @_;
1763 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1764 my ($match, $specificity); 1954 my ($match, $specificity);
1765 1955
1766 for my $region (list) { 1956 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1768 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
… …
1796sub generate_random_map { 1986sub generate_random_map {
1797 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1798 1988
1799 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
1800 1990
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 1992}
1816 1993
1817=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1818 1995
1819Register 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
… …
1824 2001
1825sub register { 2002sub register {
1826 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 2004 my $pkg = caller;
1828 2005
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 2007
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 2009}
1834 2010
1835# also paths starting with '/' 2011# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 2013
1838sub thawer_merge { 2014sub thawer_merge {
1839 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1840 2016
1841 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
… …
1846} 2022}
1847 2023
1848sub normalise { 2024sub normalise {
1849 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1850 2026
1851 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1852 2028
1853 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1854 2030
1855 # map plan: 2031 # map plan:
1856 # 2032 #
… …
1871 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 2048 $path = "$base/$path";
1873 } 2049 }
1874 2050
1875 for ($path) { 2051 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1879 } 2054 }
1880 2055
1881 $path 2056 $path
… …
1895 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1896 return $self; 2071 return $self;
1897 } 2072 }
1898 } 2073 }
1899 2074
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 2076 ()
1902} 2077}
1903 2078
2079# may re-bless or do other evil things
1904sub init { 2080sub init {
1905 my ($self) = @_; 2081 my ($self) = @_;
1906 2082
1907 $self 2083 $self
1908} 2084}
… …
1973 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1974 2150
1975 1 2151 1
1976} 2152}
1977 2153
2154# used to laod the header of an original map
1978sub load_header_orig { 2155sub load_header_orig {
1979 my ($self) = @_; 2156 my ($self) = @_;
1980 2157
1981 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1982} 2159}
1983 2160
2161# used to laod the header of an instantiated map
1984sub load_header_temp { 2162sub load_header_temp {
1985 my ($self) = @_; 2163 my ($self) = @_;
1986 2164
1987 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1988} 2166}
1989 2167
2168# called after loading the header from an instantiated map
1990sub prepare_temp { 2169sub prepare_temp {
1991 my ($self) = @_; 2170 my ($self) = @_;
1992 2171
1993 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1995 # safety 2174 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2177}
1999 2178
2179# called after loading the header from an original map
2000sub prepare_orig { 2180sub prepare_orig {
2001 my ($self) = @_; 2181 my ($self) = @_;
2002 2182
2003 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2028 2208
2029sub find; 2209sub find;
2030sub find { 2210sub find {
2031 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2032 2212
2213 cf::cede_to_tick;
2214
2033 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2034 2216
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2219
2038 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2069 2251
2070 { 2252 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2072 2254
2073 return unless $self->valid; 2255 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2257
2078 $self->alloc; 2258 $self->alloc;
2079 2259
2080 $self->pre_load; 2260 $self->pre_load;
2081 cf::cede_to_tick; 2261 cf::cede_to_tick;
2082 2262
2263 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2265 $f->skip_block;
2085 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2086 or return; 2267 or return;
2087 2268
2088 $self->post_load_original 2269 $self->post_load_original
2089 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2090 2271
2091 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2273 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2276 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2098 } 2280 }
2099 } 2281 }
2100 }
2101 2282
2102 $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);
2103 2290
2104 cf::cede_to_tick; 2291 cf::cede_to_tick;
2105 # now do the right thing for maps 2292 # now do the right thing for maps
2106 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2111 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2299 $self->decay_objects;
2113 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2114 $self->update_buttons; 2301 $self->update_buttons;
2115 cf::cede_to_tick; 2302 cf::cede_to_tick;
2116 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2117 } 2304 }
2118 2305
2119 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2308 }
2124 2309
2125 $self->post_load; 2310 $self->post_load;
2311
2312 1
2126} 2313}
2127 2314
2128# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2138# if $self->per_party; 2325# if $self->per_party;
2139 2326
2140 $self 2327 $self
2141} 2328}
2142 2329
2143# find and load all maps in the 3x3 area around a map
2144sub load_neighbours {
2145 my ($map) = @_;
2146
2147 my @neigh; # diagonal neighbours
2148
2149 for (0 .. 3) {
2150 my $neigh = $map->tile_path ($_)
2151 or next;
2152 $neigh = find $neigh, $map
2153 or next;
2154 $neigh->load;
2155
2156 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 }
2160
2161 for (grep defined $_->[0], @neigh) {
2162 my ($path, $origin) = @$_;
2163 my $neigh = find $path, $origin
2164 or next;
2165 $neigh->load;
2166 }
2167}
2168
2169sub find_sync { 2330sub find_sync {
2170 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2171 2332
2172 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
2173} 2338}
2174 2339
2175sub do_load_sync { 2340sub do_load_sync {
2176 my ($map) = @_; 2341 my ($map) = @_;
2177 2342
2343 # it's a bug to call this from the main context
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2180 2346
2181 cf::sync_job { $map->load }; 2347 $map->load;
2182} 2348}
2183 2349
2184our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2186 2352
2187sub find_async { 2353sub find_async {
2188 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2189 2355
2190 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2191 2357
2192 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2194 } 2360 }
2195 2361
2196 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2197 2363
2198 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2212 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2213 2379
2214 () 2380 ()
2215} 2381}
2216 2382
2383# common code, used by both ->save and ->swapout
2217sub save { 2384sub _save {
2218 my ($self) = @_; 2385 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2386
2222 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2223 2388
2224 return unless $self->dirty; 2389 return unless $self->dirty;
2225 2390
… …
2245 } else { 2410 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2411 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2412 }
2248} 2413}
2249 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2250sub swap_out { 2423sub swap_out {
2251 my ($self) = @_; 2424 my ($self) = @_;
2252 2425
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2258 return if $self->players; 2430 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2431
2432 # first deactivate the map and "unlink" it from the core
2433 $self->deactivate;
2434 $_->clear_links_to ($self) for values %cf::MAP;
2435 $self->state (cf::MAP_SWAPPED);
2436
2437 # then atomically save
2438 $self->_save;
2439
2440 # then free the map
2441 $self->clear;
2442}
2443
2444sub reset_at {
2445 my ($self) = @_;
2446
2447 # TODO: safety, remove and allow resettable per-player maps
2260 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2261 2449
2450 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2451 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2452
2453 $time + $to
2454}
2455
2456sub should_reset {
2457 my ($self) = @_;
2458
2459 $self->reset_at <= $cf::RUNTIME
2460}
2461
2462sub reset {
2463 my ($self) = @_;
2464
2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2466
2467 return if $self->players;
2468
2469 cf::trace "resetting map ", $self->path, "\n";
2470
2262 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # need to save uniques path
2474 unless ($self->{deny_save}) {
2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2476
2477 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2478 if $uniq;
2479 }
2480
2481 delete $cf::MAP{$self->path};
2263 2482
2264 $self->deactivate; 2483 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2485 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2486
2312 $self->unlink_save; 2487 $self->unlink_save;
2313 $self->destroy; 2488 $self->destroy;
2314} 2489}
2315 2490
… …
2323 2498
2324 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2325 2500
2326 $self->unlink_save; 2501 $self->unlink_save;
2327 2502
2328 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2508
… …
2563 2738
2564Freezes the player and moves him/her to a special map (C<{link}>). 2739Freezes the player and moves him/her to a special map (C<{link}>).
2565 2740
2566The player should be reasonably safe there for short amounts of time (e.g. 2741The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2743though, as the player cannot control the character while it is on the link
2569map. 2744map.
2570 2745
2571Will never block. 2746Will never block.
2572 2747
2573=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2595 my ($self) = @_; 2770 my ($self) = @_;
2596 2771
2597 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2598 2773
2774 ++$self->{_link_recursion};
2775
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2777
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2603 2780
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2782}
2606 2783
2607sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2609 2786
… …
2629 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2630 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2631 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2632 2809
2633 $map->load; 2810 $map->load;
2634 $map->load_neighbours;
2635 2811
2636 return unless $self->contr->active; 2812 return unless $self->contr->active;
2637 2813
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2640 2816 # entering was successful
2817 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2819 $self->activate_recursive;
2643} 2820 }
2644 2821
2822}
2823
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2824=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2825
2647Moves the player to the given map-path and coordinates by first freezing 2826Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2828that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2829the new (success) or old (failed) map position. In either case, $done will
… …
2657 2836
2658our $GOTOGEN; 2837our $GOTOGEN;
2659 2838
2660sub cf::object::player::goto { 2839sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2841
2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2846 }
2662 2847
2663 # 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
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2850
2666 $self->enter_link; 2851 $self->enter_link;
… …
2686 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2687 } 2872 }
2688 } 2873 }
2689 2874
2690 my $map = eval { 2875 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692 2877
2693 if ($map) { 2878 if ($map) {
2694 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2881 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2883 }
2699 2884
2700 $map 2885 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2711 } 2896 }
2712 2897
2713 $done->() if $done; 2898 $done->($self) if $done;
2714 })->prio (1); 2899 })->prio (1);
2715} 2900}
2716 2901
2717=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2718 2903
… …
2786 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2787 2972
2788 unless (eval { 2973 unless (eval {
2789 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2790 2975
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2800 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2801 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 }
2802 3002
2803 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2804 3004
2805 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "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. "
2813 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2815 3015
2816 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 3017 $self->leave_link;
2818 } 3018 }
2819 })->prio (1); 3019 })->prio (1);
2820} 3020}
2821 3021
… …
3048=cut 3248=cut
3049 3249
3050sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3051 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3052 3252
3053 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3054 $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]));
3055 } elsif ($self->extcmd == 1) {
3056 #TODO: version 1, remove
3057 unshift @msg, msgtype => "reply", msgid => $id;
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3059 }
3060} 3256}
3061 3257
3062=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3063 3259
3064Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3119 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3120 3316
3121 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3122 3318
3123 if (ref $msg) { 3319 if (ref $msg) {
3124 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3125 "ARRAY" eq ref $msg
3126 ? @$msg
3127 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3128 3321
3129 my @reply; 3322 my @reply;
3130 3323
3131 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3132 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3134 3327
3135 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3329 if $reply;
3137 3330
3138 } else { 3331 } else {
3139 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";
3140 } 3333 }
3141 3334
3142 cf::override; 3335 cf::override;
3143 }, 3336 },
3144); 3337);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3229) { 3422) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3425 for @funs;
3234} 3426}
3235 3427
… …
3274 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3468 }
3277 3469
3278 if ($@) { 3470 if ($@) {
3279 warn "$@"; 3471 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3282 } 3474 }
3283 3475
3284 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3285} 3477}
3286 3478
… …
3320 # for this (global event?) 3512 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3514
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3516
3325 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3326 3518
3327 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3328 0 < aio_load $path, $facedata
3329 or die "$path: $!";
3330
3331 $facedata = Coro::Storable::thaw $facedata;
3332 3520
3333 $facedata->{version} == 2 3521 $facedata->{version} == 2
3334 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3335 3523
3336 # patch in the exptable 3524 # patch in the exptable
… …
3350 3538
3351 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354 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} ;
3355 3544
3356 cf::cede_to_tick; 3545 cf::cede_to_tick;
3357 } 3546 }
3358 3547
3359 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3364 3553
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3557 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3559 }
3371 3560
3372 cf::cede_to_tick; 3561 cf::cede_to_tick;
3373 } 3562 }
3374 } 3563 }
… …
3386 3575
3387 { 3576 {
3388 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3389 3578
3390 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3391 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
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3583
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 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
3396 } else { 3587 } else {
3397 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3398 } 3589 }
3399 3590
3400 cf::cede_to_tick; 3591 cf::cede_to_tick;
3401 } 3592 }
3402 } 3593 }
3403 3594
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3596
3406 1 3597 1
3407} 3598}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3599
3429register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3431 3602
3432 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3642sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3474} 3645}
3475 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
3476sub reload_resources { 3667sub reload_resources {
3477 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3478 3669
3670 reload_exp_table;
3671 reload_materials;
3479 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3480 reload_archetypes; 3674 reload_archetypes;
3481 reload_regions; 3675 reload_regions;
3482 reload_treasures; 3676 reload_treasures;
3483 3677
3484 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3485} 3679}
3486 3680
3487sub reload_config { 3681sub reload_config {
3488 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3489 3683
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3491 or return; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3492 3687
3493 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>;
3495
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3689
3498 $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};
3499 $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};
3500 3692
3501 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3697 };
3506 warn $@ if $@; 3698 warn $@ if $@;
3507 } 3699 }
3508
3509 warn "finished reloading resource files\n";
3510} 3700}
3511 3701
3512sub pidfile() { 3702sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3528 print $fh $$; 3718 print $fh $$;
3529} 3719}
3530 3720
3531sub main_loop { 3721sub main_loop {
3532 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3533 if (1) { 3723 if (1) {
3534 EV::loop; 3724 EV::loop;
3535 } 3725 }
3536 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3538} 3728}
3539 3729
3540sub main { 3730sub main {
3541 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3542 3732
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 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.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552 3737
3553 $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
3554 3739
3555 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3556 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
… …
3562 }; 3747 };
3563 3748
3564 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3565 3750
3566 cf::sync_job { 3751 cf::sync_job {
3752 cf::incloader::init ();
3753
3754 cf::init_anim;
3755 cf::init_attackmess;
3756 cf::init_dynamic;
3757
3567 cf::load_settings; 3758 cf::load_settings;
3568 cf::load_materials;
3569 3759
3570 reload_resources; 3760 reload_resources;
3571 reload_config; 3761 reload_config;
3572 db_init; 3762 db_init;
3573 3763
… …
3585 3775
3586 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3777 use POSIX ();
3588 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};
3589 3779
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3591 }; 3781 };
3592 3782
3783 cf::object::thawer::errors_are_fatal 0;
3784 info "parse errors in files are no longer fatal from this point on.\n";
3785
3786 AE::postpone {
3787 undef &main; # free gobs of memory :)
3788 };
3789
3593 main_loop; 3790 goto &main_loop;
3594} 3791}
3595 3792
3596############################################################################# 3793#############################################################################
3597# initialisation and cleanup 3794# initialisation and cleanup
3598 3795
… …
3637 or return; 3834 or return;
3638 3835
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3837 and return;
3641 3838
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3840
3644 1 3841 1
3645} 3842}
3646 3843
3647our $uuid_lock; 3844our $uuid_lock;
… …
3659 or return; 3856 or return;
3660 3857
3661 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3662 3859
3663 unless ($value) { 3860 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3862 return;
3666 } 3863 }
3667 3864
3668 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3679 or return; 3876 or return;
3680 3877
3681 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3682 and return; 3879 and return;
3683 3880
3684 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3685 3882
3686 1 3883 1
3687 3884
3688} 3885}
3689 3886
… …
3695} 3892}
3696 3893
3697sub emergency_save() { 3894sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3699 3896
3700 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;
3701 3903
3702 cf::sync_job { 3904 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 3906
3708 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 3913 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 3915 $pl->save;
3717 } 3916 }
3718 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3719 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3720 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 3924 $map->valid or next;
3724 $map->save; 3925 $map->save;
3725 } 3926 }
3726 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3727 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3728 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3731 3934
3732 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 3936 write_uuid_sync 1;
3734 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
3735 }; 3957 };
3736 3958
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3743} 3960}
3744 3961
3745sub post_cleanup { 3962sub post_cleanup {
3746 my ($make_core) = @_; 3963 my ($make_core) = @_;
3747 3964
3965 IO::AIO::flush;
3966
3748 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 3968 if $make_core;
3750 3969
3751 my $fh = pidfile; 3970 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3753} 3972}
… …
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 3996 }
3778 warn "cleared package $pkg\n";#d#
3779} 3997}
3780 3998
3781sub do_reload_perl() { 3999sub do_reload_perl() {
3782 # can/must only be called in main 4000 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3784 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3785 return; 4003 return;
3786 } 4004 }
3787 4005
3788 return if $RELOAD++; 4006 return if $RELOAD++;
3789 4007
3790 my $t1 = AE::time; 4008 my $t1 = AE::time;
3791 4009
3792 while ($RELOAD) { 4010 while ($RELOAD) {
3793 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3794 4013
3795 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3796 4015
3797 cf::sync_job { 4016 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 4017 #cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 4018
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 4021 %EXT_CORO = ();
3815 4022
3816 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3817 %COMMAND = (); 4024 %COMMAND = ();
3818 4025
3819 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3820 %EXTCMD = (); 4027 %EXTCMD = ();
3821 %EXTICMD = (); 4028 %EXTICMD = ();
3822 4029
3823 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3826 4033
3827 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3828 eval { 4035 eval {
3829 $cb->($pkg); 4036 $cb->($pkg);
3830 1 4037 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3832 } 4039 }
3833 4040
3834 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3835 clear_package $pkg; 4042 clear_package $pkg;
3836 } 4043 }
3837 4044
3838 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 4048
3842 warn "... unloading $k"; 4049 trace "... unloading $k";
3843 delete $INC{$k}; 4050 delete $INC{$k};
3844 4051
3845 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3847 4054
… …
3850 } 4057 }
3851 4058
3852 clear_package $k; 4059 clear_package $k;
3853 } 4060 }
3854 4061
3855 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 4063 clear_package "safe::$_"
3857 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);
3858 4065
3859 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 4069
3863 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3864 # and global variables created in xs 4071 # and global variables created in xs
3865 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3866 4073
3867 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3868 4075
3869 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3870 require cf; 4077 require cf;
3871 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3872 4079
3873 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3874 cf::reload_config; 4081 cf::reload_config;
3875 4082
3876 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3877 cf::load_extensions; 4084 cf::load_extensions;
3878 4085
3879 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3883 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3886 } 4093 }
3887 4094
3888 warn "running post_init jobs"; 4095 cf::_post_init 1;
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890 4096
3891 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3892 4098
3893 1 4099 1
3894 } or do { 4100 } or do {
3895 warn $@; 4101 error $@;
3896 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3897 }; 4103 };
3898 4104
3899 warn "reloaded";
3900 --$RELOAD; 4105 --$RELOAD;
3901 } 4106 }
3902 4107
3903 $t1 = AE::time - $t1; 4108 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3905}; 4110};
3906 4111
3907our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3908 4113
3909sub reload_perl() { 4114sub reload_perl() {
… …
3930 reload_perl; 4135 reload_perl;
3931 }; 4136 };
3932 } 4137 }
3933}; 4138};
3934 4139
3935unshift @INC, $LIBDIR; 4140#############################################################################
3936 4141
3937my $bug_warning = 0; 4142my $bug_warning = 0;
3938 4143
3939our @WAIT_FOR_TICK;
3940our @WAIT_FOR_TICK_BEGIN;
3941
3942sub wait_for_tick { 4144sub wait_for_tick() {
3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3944 4146
3945 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3946 push @WAIT_FOR_TICK, $signal;
3947 $signal->wait;
3948} 4148}
3949 4149
3950sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3952 4152
3953 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3954 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3955 $signal->wait; 4155 $signal->wait;
3956} 4156}
… …
3960 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"
3961 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3962 return; 4162 return;
3963 } 4163 }
3964 4164
3965 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
3966 4166
3967 #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#
3968 4168
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $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.;
3971 Coro::async_pool { 4171 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4173 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3975 }; 4175 };
3976 } 4176 }
3977 4177
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4179 $sig->send;
3980 } 4180 }
3981 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3982 $sig->send;
3983 }
3984 4182
3985 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3987 4185
3988 if (0) { 4186 if (0) {
3989 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3993 } 4191 }
3994 } 4192 }
3995} 4193}
3996 4194
3997{ 4195{
3998 # configure BDB 4196 # configure BDB
3999 4197
4000 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
4001 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
4002 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
4003 4201
4004 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
4005 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4007 $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;
… …
4042 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4043 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4044 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4045} 4243}
4046 4244
4047my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4048 4247
4049sub _log_backtrace { 4248sub _log_backtrace {
4050 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4051 4250
4052 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4053 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4054 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4055 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4056 ++$_log_backtrace; 4259 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4058 async { 4261 async {
4059 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4060 4263
… …
4080 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4081 --$_log_backtrace; 4284 --$_log_backtrace;
4082 }; 4285 };
4083 } else { 4286 } else {
4084 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4085 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4086 } 4289 }
4087} 4290}
4088 4291
4089# load additional modules 4292# load additional modules
4090require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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