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.506 by root, Wed Feb 3 20:48:22 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
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 135
127our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
129our $NOW; 139our $NOW;
130 140
131our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
142 152
143our @POST_INIT; 153our @POST_INIT;
144 154
145our $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)
146our $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;
147 160
148binmode STDOUT; 161binmode STDOUT;
149binmode STDERR; 162binmode STDERR;
150 163
151# read virtual server time, if available 164# read virtual server time, if available
… …
162 175
163our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
164 177
165sub cf::map::normalise; 178sub cf::map::normalise;
166 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
167############################################################################# 184#############################################################################
168 185
169%REFLECT = (); 186%REFLECT = ();
170for (@REFLECT) { 187for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 188 my $reflect = JSON::XS::decode_json $_;
… …
181 198
182=over 4 199=over 4
183 200
184=item $cf::UPTIME 201=item $cf::UPTIME
185 202
186The 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.
187 219
188=item $cf::RUNTIME 220=item $cf::RUNTIME
189 221
190The 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
191every server tick. 223every server tick.
… …
197Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
200database environment. 232database environment.
201 233
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 234=item $cf::LOADAVG
211 235
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
223from wherever your confdir points to. 247from wherever your confdir points to.
224 248
225=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
226 250
227These 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
228returns 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
229per 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();
230 271
231=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
232 273
233This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 283
243=back 284=back
244 285
245=cut 286=cut
246 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
247$Coro::State::WARNHOOK = sub { 294$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 295 my $msg = join "", @_;
249 296
250 $msg .= "\n" 297 $msg .= "\n"
251 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
252 299
253 $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;
254 301
255 LOG llevError, $msg; 302 LOG llevWarn, $msg;
256}; 303};
257 304
258$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
260 307
261 warn Carp::longmess $_[0]; 308 error Carp::longmess $_[0];
262 309
263 if ($Coro::current == $Coro::main) {#d# 310 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 312 return;#d#
266 }#d# 313 }#d#
267 314
268 # kill coroutine otherwise 315 # kill coroutine otherwise
269 Coro::terminate 316 Coro::terminate
… …
291} 338}
292 339
293$EV::DIED = sub { 340$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
295}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
296 348
297############################################################################# 349#############################################################################
298 350
299=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
300 352
… …
321 $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;
322 $d 374 $d
323 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
324} 376}
325 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
326=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
327 431
328Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
329 433
330=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
336our $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
337 441
338sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
342 477
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
345 480
346The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 482is a reload or not.
348 483
349=cut 484=cut
350 485
351sub post_init(&) { 486sub post_init(&) {
352 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 }
353} 505}
354 506
355=item cf::lock_wait $string 507=item cf::lock_wait $string
356 508
357Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
396} 548}
397 549
398=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
399 551
400Like EV::periodic, but randomly selects a starting point so that the actions 552Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 553get spread over time.
402 554
403=cut 555=cut
404 556
405sub periodic($$) { 557sub periodic($$) {
406 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
411} 563}
412 564
413=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
414 566
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 574
419The 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
420used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
421 577
422Useful for short background jobs. 578Useful for short background jobs.
… …
451 } 607 }
452 } 608 }
453 609
454 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
455 # 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
456 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 613 } else {
459 $busy = 0; 614 $busy = 0;
460 Coro::schedule; 615 Coro::schedule;
461 } 616 }
462 } 617 }
… …
502=cut 657=cut
503 658
504sub sync_job(&) { 659sub sync_job(&) {
505 my ($job) = @_; 660 my ($job) = @_;
506 661
507 if ($Coro::current == $Coro::main) { 662 if (in_main) {
508 my $time = EV::time; 663 my $time = AE::time;
509 664
510 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
512 667
513 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
514 669
515 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
516 671
517 my $busy = 1; 672 my $busy = 1;
518 my @res; 673 my @res;
519 674
520 (async { 675 (async {
521 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 677 @res = eval { $job->() };
523 warn $@ if $@; 678 error $@ if $@;
524 undef $busy; 679 undef $busy;
525 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
526 681
527 while ($busy) { 682 while ($busy) {
528 if (Coro::nready) { 683 if (Coro::nready) {
… …
530 } else { 685 } else {
531 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
532 } 687 }
533 } 688 }
534 689
535 my $time = EV::time - $time; 690 my $time = AE::time - $time;
536 691
537 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
538 693
539 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
540 } else { 695 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
563 718
564 $coro 719 $coro
565} 720}
566 721
567=item fork_call { }, $args 722=item fork_call { }, @args
568 723
569Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 727never block itself or use any form of event handling.
573 728
574=cut 729=cut
575 730
731sub post_fork {
732 reset_signals;
733}
734
576sub fork_call(&@) { 735sub fork_call(&@) {
577 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
578 737
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
582 741
583 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
584 reset_signals; 743 cf::post_fork;
585 &$cb 744 &$cb
586 }, @args; 745 } @args;
587 746
588 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
748}
749
750sub objinfo {
751 (
752 "counter value" => cf::object::object_count,
753 "objects created" => cf::object::create_count,
754 "objects destroyed" => cf::object::destroy_count,
755 "freelist size" => cf::object::free_count,
756 "allocated objects" => cf::object::objects_size,
757 "active objects" => cf::object::actives_size,
758 )
589} 759}
590 760
591=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
592 762
593=cut 763=cut
… …
630within each server. 800within each server.
631 801
632=cut 802=cut
633 803
634sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
635 my ($name) = @_; 808 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
637 810
638 eval { 811 eval {
639 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
… …
649} 822}
650 823
651our $DB; 824our $DB;
652 825
653sub db_init { 826sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
656 };
657} 828}
658 829
659sub db_get($$) { 830sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
661 832
662 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
663 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
664 837
665 $! ? () 838 $! ? ()
666 : $data 839 : $data
667 }
668} 840}
669 841
670sub db_put($$$) { 842sub db_put($$$) {
671 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 872
701 my @data; 873 my @data;
702 my $md5; 874 my $md5;
703 875
704 for (0 .. $#$src) { 876 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 878 }
708 879
709 # if processing is expensive, check 880 # if processing is expensive, check
710 # checksum first 881 # checksum first
711 if (1) { 882 if (1) {
… …
728 899
729 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 901 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
732 903
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 905
735 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
738 909
… …
748 919
749=cut 920=cut
750 921
751sub datalog($@) { 922sub datalog($@) {
752 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 925}
755 926
756=back 927=back
757 928
758=cut 929=cut
… …
953 1124
954 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1127
957 } elsif (ref $type) { 1128 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
959 1130
960 } else { 1131 } else {
961 shift @arg; 1132 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
963 } 1134 }
964 } 1135 }
965} 1136}
966 1137
967sub _object_attach { 1138sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
978 } 1149 }
979 1150
980 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
981 } else { 1152 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1154 }
984 1155
985 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
986} 1157}
987 1158
… …
1046 1217
1047 for (@$callbacks) { 1218 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1049 1220
1050 if ($@) { 1221 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1223 override;
1054 } 1224 }
1055 1225
1056 return 1 if $override; 1226 return 1 if $override;
1057 } 1227 }
… …
1136 for (@$attach) { 1306 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1139 } 1309 }
1140 } else { 1310 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1312 }
1143 } 1313 }
1144} 1314}
1145 1315
1146cf::attachable->attach ( 1316cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1174 1344
1175 sync_job { 1345 sync_job {
1176 if (length $$rdata) { 1346 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1180 1351
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1355 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1207 1378
1208 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1381 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1212 } 1383 }
1213 } else { 1384 } else {
1214 aio_unlink $filename; 1385 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1216 } 1387 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1412 $av = $st->{objs};
1242 } 1413 }
1243 1414
1244 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1247 1419
1248 ($data, $av) 1420 ($data, $av)
1249} 1421}
1250 1422
1251=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
… …
1310} 1482}
1311 1483
1312use File::Glob (); 1484use File::Glob ();
1313 1485
1314cf::player->attach ( 1486cf::player->attach (
1315 on_command => sub { 1487 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1317 1489
1318 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1319 or return; 1491 or return;
1320 1492
… …
1328 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1329 1501
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1503
1332 if (ref $msg) { 1504 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1506
1338 my @reply; 1507 my @reply;
1339 1508
1340 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1343 1512
1344 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1514 if $reply;
1346 1515
1347 } else { 1516 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1518 }
1350 1519
1351 cf::override; 1520 cf::override;
1352 }, 1521 },
1353); 1522);
… …
1363 }; 1532 };
1364 1533
1365 $grp 1534 $grp
1366} 1535}
1367 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
1368sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1369 cf::sync_job { 1553 cf::sync_job {
1370 my %todo; 1554 my %todo;
1371 1555
1372 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1557 next unless -r $path;
… …
1391 1575
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1578
1395 $ext{source} = 1579 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1398 . $source 1582 . $source
1399 . "\n};\n1"; 1583 . "\n};\n1";
1400 1584
1401 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1598 next ext
1415 unless exists $done{$_}; 1599 unless exists $done{$_};
1416 } 1600 }
1417 1601
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 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
1420 my $active = eval $v->{source}; 1613 my $active = eval $source;
1421 1614
1422 if (length $@) { 1615 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1424 1617
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 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};
1427 } else { 1623 } else {
1428 $done{$k} = delete $todo{$k}; 1624 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1625 push @EXTS, $v->{pkg};
1430 $progress = 1; 1626 $progress = 1;
1431 1627
1432 warn "$v->{base}: extension inactive.\n" 1628 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1629 unless $active;
1434 } 1630 }
1435 } 1631 }
1436 1632
1437 unless ($progress) { 1633 unless ($progress) {
… …
1439 1635
1440 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1443 } 1639 }
1640
1641 last;
1444 } 1642 }
1445 } 1643 }
1446 }; 1644 };
1447} 1645}
1448 1646
… …
1533 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1534 } 1732 }
1535 } 1733 }
1536} 1734}
1537 1735
1736cf::player->attach (
1737 on_load => sub {
1738 my ($pl, $path) = @_;
1739
1740 # restore slots saved in save, below
1741 my $slots = delete $pl->{_slots};
1742
1743 $pl->ob->current_weapon ($slots->[0]);
1744 $pl->combat_ob ($slots->[1]);
1745 $pl->ranged_ob ($slots->[2]);
1746 },
1747);
1748
1538sub save($) { 1749sub save($) {
1539 my ($pl) = @_; 1750 my ($pl) = @_;
1540 1751
1541 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1542 1753
… …
1547 1758
1548 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1550 1761
1551 cf::get_slot 0.01; 1762 cf::get_slot 0.01;
1763
1764 # save slots, to be restored later
1765 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1766
1553 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1768 cf::cede_to_tick;
1555} 1769}
1556 1770
… …
1590 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1591 1805
1592 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1593 $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
1594 1808
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1810 $pl->deactivate;
1811
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1600 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1601 1817
1602 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1658 \@logins 1874 \@logins
1659} 1875}
1660 1876
1661=item $player->maps 1877=item $player->maps
1662 1878
1879=item cf::player::maps $login
1880
1663Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1664player. May block. 1882player. May block.
1665 1883
1666=cut 1884=cut
1667 1885
… …
1729=cut 1947=cut
1730 1948
1731sub find_by_path($) { 1949sub find_by_path($) {
1732 my ($path) = @_; 1950 my ($path) = @_;
1733 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1734 my ($match, $specificity); 1954 my ($match, $specificity);
1735 1955
1736 for my $region (list) { 1956 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1986sub generate_random_map {
1767 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1768 1988
1769 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
1770 1990
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1992}
1786 1993
1787=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1788 1995
1789Register 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
… …
1794 2001
1795sub register { 2002sub register {
1796 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 2004 my $pkg = caller;
1798 2005
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 2007
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 2009}
1804 2010
1805# also paths starting with '/' 2011# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 2013
1808sub thawer_merge { 2014sub thawer_merge {
1809 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1810 2016
1811 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
… …
1816} 2022}
1817 2023
1818sub normalise { 2024sub normalise {
1819 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1820 2026
1821 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1822 2028
1823 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1824 2030
1825 # map plan: 2031 # map plan:
1826 # 2032 #
… …
1841 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 2048 $path = "$base/$path";
1843 } 2049 }
1844 2050
1845 for ($path) { 2051 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1849 } 2054 }
1850 2055
1851 $path 2056 $path
… …
1865 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1866 return $self; 2071 return $self;
1867 } 2072 }
1868 } 2073 }
1869 2074
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2076 ()
1872} 2077}
1873 2078
2079# may re-bless or do other evil things
1874sub init { 2080sub init {
1875 my ($self) = @_; 2081 my ($self) = @_;
1876 2082
1877 $self 2083 $self
1878} 2084}
… …
1943 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1944 2150
1945 1 2151 1
1946} 2152}
1947 2153
2154# used to laod the header of an original map
1948sub load_header_orig { 2155sub load_header_orig {
1949 my ($self) = @_; 2156 my ($self) = @_;
1950 2157
1951 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1952} 2159}
1953 2160
2161# used to laod the header of an instantiated map
1954sub load_header_temp { 2162sub load_header_temp {
1955 my ($self) = @_; 2163 my ($self) = @_;
1956 2164
1957 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1958} 2166}
1959 2167
2168# called after loading the header from an instantiated map
1960sub prepare_temp { 2169sub prepare_temp {
1961 my ($self) = @_; 2170 my ($self) = @_;
1962 2171
1963 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1965 # safety 2174 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2177}
1969 2178
2179# called after loading the header from an original map
1970sub prepare_orig { 2180sub prepare_orig {
1971 my ($self) = @_; 2181 my ($self) = @_;
1972 2182
1973 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
1998 2208
1999sub find; 2209sub find;
2000sub find { 2210sub find {
2001 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2002 2212
2213 cf::cede_to_tick;
2214
2003 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2004 2216
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2219
2008 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2039 2251
2040 { 2252 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2042 2254
2043 return unless $self->valid; 2255 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2257
2048 $self->alloc; 2258 $self->alloc;
2049 2259
2050 $self->pre_load; 2260 $self->pre_load;
2051 cf::cede_to_tick; 2261 cf::cede_to_tick;
2052 2262
2263 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2265 $f->skip_block;
2055 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2056 or return; 2267 or return;
2057 2268
2058 $self->post_load_original 2269 $self->post_load_original
2059 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2060 2271
2061 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2273 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2276 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2068 } 2280 }
2069 } 2281 }
2070 }
2071 2282
2072 $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);
2073 2290
2074 cf::cede_to_tick; 2291 cf::cede_to_tick;
2075 # now do the right thing for maps 2292 # now do the right thing for maps
2076 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2081 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2299 $self->decay_objects;
2083 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2084 $self->update_buttons; 2301 $self->update_buttons;
2085 cf::cede_to_tick; 2302 cf::cede_to_tick;
2086 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2087 } 2304 }
2088 2305
2089 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2308 }
2094 2309
2095 $self->post_load; 2310 $self->post_load;
2096}
2097 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2098sub customise_for { 2318sub customise_for {
2099 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2100 2320
2101 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2322 if $self->per_player;
… …
2105# if $self->per_party; 2325# if $self->per_party;
2106 2326
2107 $self 2327 $self
2108} 2328}
2109 2329
2110# find and load all maps in the 3x3 area around a map
2111sub load_neighbours {
2112 my ($map) = @_;
2113
2114 my @neigh; # diagonal neighbours
2115
2116 for (0 .. 3) {
2117 my $neigh = $map->tile_path ($_)
2118 or next;
2119 $neigh = find $neigh, $map
2120 or next;
2121 $neigh->load;
2122
2123 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 }
2127
2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
2130 my $neigh = find $path, $origin
2131 or next;
2132 $neigh->load;
2133 }
2134}
2135
2136sub find_sync { 2330sub find_sync {
2137 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2138 2332
2139 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
2140} 2338}
2141 2339
2142sub do_load_sync { 2340sub do_load_sync {
2143 my ($map) = @_; 2341 my ($map) = @_;
2144 2342
2343 # it's a bug to call this from the main context
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2147 2346
2148 cf::sync_job { $map->load }; 2347 $map->load;
2149} 2348}
2150 2349
2151our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2153 2352
2154sub find_async { 2353sub find_async {
2155 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2156 2355
2157 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2158 2357
2159 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2161 } 2360 }
2162 2361
2163 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2164 2363
2165 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2179 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2180 2379
2181 () 2380 ()
2182} 2381}
2183 2382
2383# common code, used by both ->save and ->swapout
2184sub save { 2384sub _save {
2185 my ($self) = @_; 2385 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2386
2189 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2190 2388
2191 return unless $self->dirty; 2389 return unless $self->dirty;
2192 2390
… …
2212 } else { 2410 } else {
2213 $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);
2214 } 2412 }
2215} 2413}
2216 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2217sub swap_out { 2423sub swap_out {
2218 my ($self) = @_; 2424 my ($self) = @_;
2219 2425
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2225 return if $self->players; 2430 return if $self->players;
2226 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
2227 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2228 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
2229 $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};
2230 2482
2231 $self->deactivate; 2483 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2485 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2486
2279 $self->unlink_save; 2487 $self->unlink_save;
2280 $self->destroy; 2488 $self->destroy;
2281} 2489}
2282 2490
… …
2290 2498
2291 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2292 2500
2293 $self->unlink_save; 2501 $self->unlink_save;
2294 2502
2295 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2508
… …
2530 2738
2531Freezes 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}>).
2532 2740
2533The 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.
2534for 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,
2535though, 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
2536map. 2744map.
2537 2745
2538Will never block. 2746Will never block.
2539 2747
2540=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2562 my ($self) = @_; 2770 my ($self) = @_;
2563 2771
2564 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2565 2773
2774 ++$self->{_link_recursion};
2775
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2777
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2570 2780
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2782}
2573 2783
2574sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2576 2786
… …
2596 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2599 2809
2600 $map->load; 2810 $map->load;
2601 $map->load_neighbours;
2602 2811
2603 return unless $self->contr->active; 2812 return unless $self->contr->active;
2604 2813
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2607 2816 # entering was successful
2817 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2819 $self->activate_recursive;
2610} 2820 }
2611 2821
2822}
2823
2612=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)]])
2613 2825
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
… …
2624 2836
2625our $GOTOGEN; 2837our $GOTOGEN;
2626 2838
2627sub cf::object::player::goto { 2839sub cf::object::player::goto {
2628 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 }
2629 2847
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2850
2633 $self->enter_link; 2851 $self->enter_link;
… …
2653 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2654 } 2872 }
2655 } 2873 }
2656 2874
2657 my $map = eval { 2875 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2877
2660 if ($map) { 2878 if ($map) {
2661 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2881 } else {
2664 $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);
2665 } 2883 }
2666 2884
2667 $map 2885 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2678 } 2896 }
2679 2897
2680 $done->() if $done; 2898 $done->($self) if $done;
2681 })->prio (1); 2899 })->prio (1);
2682} 2900}
2683 2901
2684=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2685 2903
… …
2753 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2754 2972
2755 unless (eval { 2973 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2757 2975
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2768 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 }
2769 3002
2770 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2771 3004
2772 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2782 3015
2783 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 3017 $self->leave_link;
2785 } 3018 }
2786 })->prio (1); 3019 })->prio (1);
2787} 3020}
2788 3021
… …
3015=cut 3248=cut
3016 3249
3017sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3019 3252
3020 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3021 $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]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
3027} 3256}
3028 3257
3029=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3030 3259
3031Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3086 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3087 3316
3088 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089 3318
3090 if (ref $msg) { 3319 if (ref $msg) {
3091 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095 3321
3096 my @reply; 3322 my @reply;
3097 3323
3098 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3099 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3101 3327
3102 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3329 if $reply;
3104 3330
3105 } else { 3331 } else {
3106 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";
3107 } 3333 }
3108 3334
3109 cf::override; 3335 cf::override;
3110 }, 3336 },
3111); 3337);
… …
3131 3357
3132 $coro 3358 $coro
3133} 3359}
3134 3360
3135cf::client->attach ( 3361cf::client->attach (
3136 on_destroy => sub { 3362 on_client_destroy => sub {
3137 my ($ns) = @_; 3363 my ($ns) = @_;
3138 3364
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3366 },
3141); 3367);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3196) { 3422) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3425 for @funs;
3201} 3426}
3202 3427
… …
3241 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3468 }
3244 3469
3245 if ($@) { 3470 if ($@) {
3246 warn "$@"; 3471 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3249 } 3474 }
3250 3475
3251 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3252} 3477}
3253 3478
… …
3287 # for this (global event?) 3512 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3514
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3516
3292 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3293 3518
3294 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3295 0 < aio_load $path, $facedata
3296 or die "$path: $!";
3297
3298 $facedata = Coro::Storable::thaw $facedata;
3299 3520
3300 $facedata->{version} == 2 3521 $facedata->{version} == 2
3301 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3302 3523
3303 # patch in the exptable 3524 # patch in the exptable
… …
3317 3538
3318 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321 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} ;
3322 3544
3323 cf::cede_to_tick; 3545 cf::cede_to_tick;
3324 } 3546 }
3325 3547
3326 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3331 3553
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3557 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3559 }
3338 3560
3339 cf::cede_to_tick; 3561 cf::cede_to_tick;
3340 } 3562 }
3341 } 3563 }
… …
3353 3575
3354 { 3576 {
3355 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3356 3578
3357 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3358 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
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3583
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 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
3363 } else { 3587 } else {
3364 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3365 } 3589 }
3366 3590
3367 cf::cede_to_tick; 3591 cf::cede_to_tick;
3368 } 3592 }
3369 } 3593 }
3370 3594
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3596
3373 1 3597 1
3374} 3598}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3599
3396register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3398 3602
3399 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3642sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3441} 3645}
3442 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
3443sub reload_resources { 3667sub reload_resources {
3444 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3445 3669
3670 reload_exp_table;
3671 reload_materials;
3446 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3447 reload_archetypes; 3674 reload_archetypes;
3448 reload_regions; 3675 reload_regions;
3449 reload_treasures; 3676 reload_treasures;
3450 3677
3451 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3452} 3679}
3453 3680
3454sub reload_config { 3681sub reload_config {
3455 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3456 3683
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3458 or return; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3459 3687
3460 local $/;
3461 *CFG = YAML::XS::Load scalar <$fh>;
3462
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3689
3465 $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};
3466 $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};
3467 3692
3468 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3697 };
3473 warn $@ if $@; 3698 warn $@ if $@;
3474 } 3699 }
3475
3476 warn "finished reloading resource files\n";
3477} 3700}
3478 3701
3479sub pidfile() { 3702sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3495 print $fh $$; 3718 print $fh $$;
3496} 3719}
3497 3720
3498sub main_loop { 3721sub main_loop {
3499 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3500 if (1) { 3723 if (1) {
3501 EV::loop; 3724 EV::loop;
3502 } 3725 }
3503 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3505} 3728}
3506 3729
3507sub main { 3730sub main {
3508 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3509 3732
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 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.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3737
3520 $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
3521 3739
3522 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
… …
3529 }; 3747 };
3530 3748
3531 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3532 3750
3533 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
3534 cf::load_settings; 3758 cf::load_settings;
3535 cf::load_materials;
3536 3759
3537 reload_resources; 3760 reload_resources;
3538 reload_config; 3761 reload_config;
3539 db_init; 3762 db_init;
3540 3763
3541 cf::init_uuid; 3764 cf::init_uuid;
3542 cf::init_signals; 3765 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3766 cf::init_skills;
3545 3767
3546 cf::init_beforeplay; 3768 cf::init_beforeplay;
3547 3769
3548 atomic; 3770 atomic;
… …
3553 3775
3554 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3777 use POSIX ();
3556 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};
3557 3779
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3559 }; 3781 };
3560 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
3561 main_loop; 3790 goto &main_loop;
3562} 3791}
3563 3792
3564############################################################################# 3793#############################################################################
3565# initialisation and cleanup 3794# initialisation and cleanup
3566 3795
3567# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3568BEGIN { 3797BEGIN {
3569 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3573 }; 3802 };
3574 } 3803 }
3575} 3804}
3576 3805
3577sub write_runtime_sync { 3806sub write_runtime_sync {
3578 my $t0 = EV::time; 3807 my $t0 = AE::time;
3579 3808
3580 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3582 3811
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3834 or return;
3606 3835
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3837 and return;
3609 3838
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3840
3612 1 3841 1
3613} 3842}
3614 3843
3615our $uuid_lock; 3844our $uuid_lock;
… …
3627 or return; 3856 or return;
3628 3857
3629 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3630 3859
3631 unless ($value) { 3860 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3862 return;
3634 } 3863 }
3635 3864
3636 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3647 or return; 3876 or return;
3648 3877
3649 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3650 and return; 3879 and return;
3651 3880
3652 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3653 3882
3654 1 3883 1
3655 3884
3656} 3885}
3657 3886
… …
3663} 3892}
3664 3893
3665sub emergency_save() { 3894sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3667 3896
3668 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;
3669 3903
3670 cf::sync_job { 3904 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 3906
3676 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3913 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3915 $pl->save;
3685 } 3916 }
3686 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3687 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3688 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3924 $map->valid or next;
3692 $map->save; 3925 $map->save;
3693 } 3926 }
3694 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3695 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3699 3934
3700 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3936 write_uuid_sync 1;
3702 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
3703 }; 3957 };
3704 3958
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3711} 3960}
3712 3961
3713sub post_cleanup { 3962sub post_cleanup {
3714 my ($make_core) = @_; 3963 my ($make_core) = @_;
3715 3964
3965 IO::AIO::flush;
3966
3716 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3968 if $make_core;
3718 3969
3719 my $fh = pidfile; 3970 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3721} 3972}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3996 }
3746 warn "cleared package $pkg\n";#d#
3747} 3997}
3748 3998
3749sub do_reload_perl() { 3999sub do_reload_perl() {
3750 # can/must only be called in main 4000 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3752 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3753 return; 4003 return;
3754 } 4004 }
3755 4005
3756 return if $RELOAD++; 4006 return if $RELOAD++;
3757 4007
3758 my $t1 = EV::time; 4008 my $t1 = AE::time;
3759 4009
3760 while ($RELOAD) { 4010 while ($RELOAD) {
3761 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3762 4013
3763 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3764 4015
3765 cf::sync_job { 4016 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 4017 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 4018
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 4021 %EXT_CORO = ();
3783 4022
3784 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3785 %COMMAND = (); 4024 %COMMAND = ();
3786 4025
3787 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3788 %EXTCMD = (); 4027 %EXTCMD = ();
3789 %EXTICMD = (); 4028 %EXTICMD = ();
3790 4029
3791 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3794 4033
3795 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3796 eval { 4035 eval {
3797 $cb->($pkg); 4036 $cb->($pkg);
3798 1 4037 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3800 } 4039 }
3801 4040
3802 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3803 clear_package $pkg; 4042 clear_package $pkg;
3804 } 4043 }
3805 4044
3806 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 4048
3810 warn "... unloading $k"; 4049 trace "... unloading $k";
3811 delete $INC{$k}; 4050 delete $INC{$k};
3812 4051
3813 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3815 4054
… …
3818 } 4057 }
3819 4058
3820 clear_package $k; 4059 clear_package $k;
3821 } 4060 }
3822 4061
3823 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 4063 clear_package "safe::$_"
3825 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);
3826 4065
3827 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 4069
3831 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3832 # and global variables created in xs 4071 # and global variables created in xs
3833 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3834 4073
3835 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3836 4075
3837 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3838 require cf; 4077 require cf;
3839 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3840 4079
3841 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3842 cf::reload_config; 4081 cf::reload_config;
3843 4082
3844 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3845 cf::load_extensions; 4084 cf::load_extensions;
3846 4085
3847 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3851 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3854 } 4093 }
3855 4094
3856 warn "running post_init jobs"; 4095 cf::_post_init 1;
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858 4096
3859 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3860 4098
3861 1 4099 1
3862 } or do { 4100 } or do {
3863 warn $@; 4101 error $@;
3864 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3865 }; 4103 };
3866 4104
3867 warn "reloaded";
3868 --$RELOAD; 4105 --$RELOAD;
3869 } 4106 }
3870 4107
3871 $t1 = EV::time - $t1; 4108 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3873}; 4110};
3874 4111
3875our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3876 4113
3877sub reload_perl() { 4114sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3880 4117
3881 $RELOAD_WATCHER ||= cf::async { 4118 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 4119 Coro::AIO::aio_wait cache_extensions;
3883 4120
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4122 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
3887 }; 4124 };
3888 }; 4125 };
3889} 4126}
… …
3898 reload_perl; 4135 reload_perl;
3899 }; 4136 };
3900 } 4137 }
3901}; 4138};
3902 4139
3903unshift @INC, $LIBDIR; 4140#############################################################################
3904 4141
3905my $bug_warning = 0; 4142my $bug_warning = 0;
3906 4143
3907our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN;
3909
3910sub wait_for_tick { 4144sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3912 4146
3913 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3914 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait;
3916} 4148}
3917 4149
3918sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3920 4152
3921 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4155 $signal->wait;
3924} 4156}
… …
3928 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"
3929 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3930 return; 4162 return;
3931 } 4163 }
3932 4164
3933 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
3934 4166
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4168
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $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.;
3939 Coro::async_pool { 4171 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4173 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3943 }; 4175 };
3944 } 4176 }
3945 4177
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4179 $sig->send;
3948 } 4180 }
3949 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3950 $sig->send;
3951 }
3952 4182
3953 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3954 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3955 4185
3956 if (0) { 4186 if (0) {
3957 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3961 } 4191 }
3962 } 4192 }
3963} 4193}
3964 4194
3965{ 4195{
3966 # configure BDB 4196 # configure BDB
3967 4197
3968 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
3969 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3970 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3971 4201
3972 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3973 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975 $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;
… …
4010 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4013} 4243}
4014 4244
4015my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4016 4247
4017sub _log_backtrace { 4248sub _log_backtrace {
4018 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4019 4250
4020 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4021 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4024 ++$_log_backtrace; 4259 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4026 async { 4261 async {
4027 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4028 4263
… …
4048 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace; 4284 --$_log_backtrace;
4050 }; 4285 };
4051 } else { 4286 } else {
4052 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054 } 4289 }
4055} 4290}
4056 4291
4057# load additional modules 4292# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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