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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 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}, $rmp->{miningstyle},
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;
2311
2312 1
2096} 2313}
2097 2314
2098# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2108# if $self->per_party; 2325# if $self->per_party;
2109 2326
2110 $self 2327 $self
2111} 2328}
2112 2329
2113# find and load all maps in the 3x3 area around a map
2114sub load_neighbours {
2115 my ($map) = @_;
2116
2117 my @neigh; # diagonal neighbours
2118
2119 for (0 .. 3) {
2120 my $neigh = $map->tile_path ($_)
2121 or next;
2122 $neigh = find $neigh, $map
2123 or next;
2124 $neigh->load;
2125
2126 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 }
2130
2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
2133 my $neigh = find $path, $origin
2134 or next;
2135 $neigh->load;
2136 }
2137}
2138
2139sub find_sync { 2330sub find_sync {
2140 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2141 2332
2142 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
2143} 2338}
2144 2339
2145sub do_load_sync { 2340sub do_load_sync {
2146 my ($map) = @_; 2341 my ($map) = @_;
2147 2342
2343 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2150 2346
2151 cf::sync_job { $map->load }; 2347 $map->load;
2152} 2348}
2153 2349
2154our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2156 2352
2157sub find_async { 2353sub find_async {
2158 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2159 2355
2160 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2161 2357
2162 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2164 } 2360 }
2165 2361
2166 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2167 2363
2168 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2182 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2183 2379
2184 () 2380 ()
2185} 2381}
2186 2382
2383# common code, used by both ->save and ->swapout
2187sub save { 2384sub _save {
2188 my ($self) = @_; 2385 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2386
2192 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2193 2388
2194 return unless $self->dirty; 2389 return unless $self->dirty;
2195 2390
… …
2215 } else { 2410 } else {
2216 $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);
2217 } 2412 }
2218} 2413}
2219 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2220sub swap_out { 2423sub swap_out {
2221 my ($self) = @_; 2424 my ($self) = @_;
2222 2425
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2228 return if $self->players; 2430 return if $self->players;
2229 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
2230 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2231 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
2232 $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};
2233 2482
2234 $self->deactivate; 2483 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2485 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2486
2282 $self->unlink_save; 2487 $self->unlink_save;
2283 $self->destroy; 2488 $self->destroy;
2284} 2489}
2285 2490
… …
2293 2498
2294 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2295 2500
2296 $self->unlink_save; 2501 $self->unlink_save;
2297 2502
2298 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2508
… …
2533 2738
2534Freezes 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}>).
2535 2740
2536The 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.
2537for 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,
2538though, 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
2539map. 2744map.
2540 2745
2541Will never block. 2746Will never block.
2542 2747
2543=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2565 my ($self) = @_; 2770 my ($self) = @_;
2566 2771
2567 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2568 2773
2774 ++$self->{_link_recursion};
2775
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2777
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2573 2780
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2782}
2576 2783
2577sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2579 2786
… …
2599 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2602 2809
2603 $map->load; 2810 $map->load;
2604 $map->load_neighbours;
2605 2811
2606 return unless $self->contr->active; 2812 return unless $self->contr->active;
2607 2813
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2610 2816 # entering was successful
2817 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2819 $self->activate_recursive;
2613} 2820 }
2614 2821
2822}
2823
2615=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)]])
2616 2825
2617Moves 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
2618her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2619that 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
2620the 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
… …
2627 2836
2628our $GOTOGEN; 2837our $GOTOGEN;
2629 2838
2630sub cf::object::player::goto { 2839sub cf::object::player::goto {
2631 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 }
2632 2847
2633 # 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
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2850
2636 $self->enter_link; 2851 $self->enter_link;
… …
2656 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2657 } 2872 }
2658 } 2873 }
2659 2874
2660 my $map = eval { 2875 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2877
2663 if ($map) { 2878 if ($map) {
2664 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2881 } else {
2667 $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);
2668 } 2883 }
2669 2884
2670 $map 2885 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2681 } 2896 }
2682 2897
2683 $done->() if $done; 2898 $done->($self) if $done;
2684 })->prio (1); 2899 })->prio (1);
2685} 2900}
2686 2901
2687=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2688 2903
… …
2756 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2757 2972
2758 unless (eval { 2973 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2760 2975
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2771 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 }
2772 3002
2773 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2774 3004
2775 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "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. "
2783 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2785 3015
2786 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 3017 $self->leave_link;
2788 } 3018 }
2789 })->prio (1); 3019 })->prio (1);
2790} 3020}
2791 3021
… …
3018=cut 3248=cut
3019 3249
3020sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3022 3252
3023 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3024 $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]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
3030} 3256}
3031 3257
3032=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3033 3259
3034Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3089 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3090 3316
3091 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092 3318
3093 if (ref $msg) { 3319 if (ref $msg) {
3094 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098 3321
3099 my @reply; 3322 my @reply;
3100 3323
3101 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3102 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3104 3327
3105 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3329 if $reply;
3107 3330
3108 } else { 3331 } else {
3109 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";
3110 } 3333 }
3111 3334
3112 cf::override; 3335 cf::override;
3113 }, 3336 },
3114); 3337);
… …
3134 3357
3135 $coro 3358 $coro
3136} 3359}
3137 3360
3138cf::client->attach ( 3361cf::client->attach (
3139 on_destroy => sub { 3362 on_client_destroy => sub {
3140 my ($ns) = @_; 3363 my ($ns) = @_;
3141 3364
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3366 },
3144); 3367);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3199) { 3422) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3425 for @funs;
3204} 3426}
3205 3427
… …
3244 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3468 }
3247 3469
3248 if ($@) { 3470 if ($@) {
3249 warn "$@"; 3471 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3252 } 3474 }
3253 3475
3254 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3255} 3477}
3256 3478
… …
3281=cut 3503=cut
3282 3504
3283############################################################################# 3505#############################################################################
3284# the server's init and main functions 3506# the server's init and main functions
3285 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3286sub load_facedata($) { 3510sub load_facedata($) {
3287 my ($path) = @_; 3511 my ($path) = @_;
3288 3512
3289 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3290 # for this (global event?) 3514 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3516
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3518
3295 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3296 3520
3297 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3522
3303 $facedata->{version} == 2 3523 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3305 3525
3306 # patch in the exptable 3526 # patch in the exptable
… …
3320 3540
3321 cf::face::set_visibility $idx, $info->{visibility}; 3541 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3542 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d#
3325 3547
3326 cf::cede_to_tick; 3548 cf::cede_to_tick;
3327 } 3549 }
3328 3550
3329 while (my ($face, $info) = each %$faces) { 3551 while (my ($face, $info) = each %$faces) {
… …
3334 3556
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3557 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3558 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3560 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3561 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3562 }
3341 3563
3342 cf::cede_to_tick; 3564 cf::cede_to_tick;
3343 } 3565 }
3344 } 3566 }
… …
3356 3578
3357 { 3579 {
3358 my $res = $facedata->{resource}; 3580 my $res = $facedata->{resource};
3359 3581
3360 while (my ($name, $info) = each %$res) { 3582 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) { 3583 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3585 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3586
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d#
3366 } else { 3591 } else {
3367 $RESOURCE{$name} = $info; 3592# $RESOURCE{$name} = $info; # unused
3368 } 3593 }
3369 3594
3370 cf::cede_to_tick; 3595 cf::cede_to_tick;
3371 } 3596 }
3372 } 3597 }
3373 3598
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3599 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3600
3376 1 3601 1
3377} 3602}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3603
3399register_exticmd fx_want => sub { 3604register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3605 my ($ns, $want) = @_;
3401 3606
3402 while (my ($k, $v) = each %$want) { 3607 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3646sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3647 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3648 or die "unable to load treasurelists\n";
3444} 3649}
3445 3650
3651sub reload_sound {
3652 trace "loading sound config from $DATADIR/sound\n";
3653
3654 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3655
3656 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3657 my $sound = $soundconf->{compat}[$_]
3658 or next;
3659
3660 my $face = cf::face::find "sound/$sound->[1]";
3661 cf::sound::set $sound->[0] => $face;
3662 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3663 }
3664
3665 while (my ($k, $v) = each %{$soundconf->{event}}) {
3666 my $face = cf::face::find "sound/$v";
3667 cf::sound::set $k => $face;
3668 }
3669}
3670
3446sub reload_resources { 3671sub reload_resources {
3447 warn "reloading resource files...\n"; 3672 trace "reloading resource files...\n";
3448 3673
3674 reload_exp_table;
3675 reload_materials;
3449 reload_facedata; 3676 reload_facedata;
3677 reload_sound;
3450 reload_archetypes; 3678 reload_archetypes;
3451 reload_regions; 3679 reload_regions;
3452 reload_treasures; 3680 reload_treasures;
3453 3681
3454 warn "finished reloading resource files\n"; 3682 trace "finished reloading resource files\n";
3455} 3683}
3456 3684
3457sub reload_config { 3685sub reload_config {
3458 warn "reloading config file...\n"; 3686 trace "reloading config file...\n";
3459 3687
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3688 my $config = load_file "$CONFDIR/config";
3461 or return; 3689 utf8::decode $config;
3690 *CFG = decode_yaml $config;
3462 3691
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3692 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3693
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3694 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3695 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3696
3471 if (exists $CFG{mlockall}) { 3697 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3699 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3700 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3701 };
3476 warn $@ if $@; 3702 warn $@ if $@;
3477 } 3703 }
3478
3479 warn "finished reloading resource files\n";
3480} 3704}
3481 3705
3482sub pidfile() { 3706sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3707 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3708 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3721 seek $fh, 0, 0;
3498 print $fh $$; 3722 print $fh $$;
3499} 3723}
3500 3724
3501sub main_loop { 3725sub main_loop {
3502 warn "EV::loop starting\n"; 3726 trace "EV::loop starting\n";
3503 if (1) { 3727 if (1) {
3504 EV::loop; 3728 EV::loop;
3505 } 3729 }
3506 warn "EV::loop returned\n"; 3730 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3731 goto &main_loop unless $REALLY_UNLOOP;
3508} 3732}
3509 3733
3510sub main { 3734sub main {
3511 cf::init_globals; # initialise logging 3735 cf::init_globals; # initialise logging
3512 3736
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3741
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3743
3525 # we must not ever block the main coroutine 3744 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3745 local $Coro::idle = sub {
… …
3532 }; 3751 };
3533 3752
3534 evthread_start IO::AIO::poll_fileno; 3753 evthread_start IO::AIO::poll_fileno;
3535 3754
3536 cf::sync_job { 3755 cf::sync_job {
3756 cf::incloader::init ();
3757
3758 cf::init_anim;
3759 cf::init_attackmess;
3760 cf::init_dynamic;
3761
3537 cf::load_settings; 3762 cf::load_settings;
3538 cf::load_materials;
3539 3763
3540 reload_resources; 3764 reload_resources;
3541 reload_config; 3765 reload_config;
3542 db_init; 3766 db_init;
3543 3767
3544 cf::init_uuid; 3768 cf::init_uuid;
3545 cf::init_signals; 3769 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3770 cf::init_skills;
3548 3771
3549 cf::init_beforeplay; 3772 cf::init_beforeplay;
3550 3773
3551 atomic; 3774 atomic;
… …
3556 3779
3557 # no (long-running) fork's whatsoever before this point(!) 3780 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3781 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3782 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3783
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3784 cf::_post_init 0;
3562 }; 3785 };
3563 3786
3787 cf::object::thawer::errors_are_fatal 0;
3788 info "parse errors in files are no longer fatal from this point on.\n";
3789
3790 AE::postpone {
3791 undef &main; # free gobs of memory :)
3792 };
3793
3564 main_loop; 3794 goto &main_loop;
3565} 3795}
3566 3796
3567############################################################################# 3797#############################################################################
3568# initialisation and cleanup 3798# initialisation and cleanup
3569 3799
3570# install some emergency cleanup handlers 3800# install some emergency cleanup handlers
3571BEGIN { 3801BEGIN {
3572 our %SIGWATCHER = (); 3802 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3803 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3804 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3805 cf::cleanup "SIG$signal";
3576 }; 3806 };
3577 } 3807 }
3578} 3808}
3579 3809
3580sub write_runtime_sync { 3810sub write_runtime_sync {
3581 my $t0 = EV::time; 3811 my $t0 = AE::time;
3582 3812
3583 # first touch the runtime file to show we are still running: 3813 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3814 # the fsync below can take a very very long time.
3585 3815
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3816 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3838 or return;
3609 3839
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3840 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3841 and return;
3612 3842
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3843 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3844
3615 1 3845 1
3616} 3846}
3617 3847
3618our $uuid_lock; 3848our $uuid_lock;
… …
3630 or return; 3860 or return;
3631 3861
3632 my $value = uuid_seq uuid_cur; 3862 my $value = uuid_seq uuid_cur;
3633 3863
3634 unless ($value) { 3864 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3865 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3866 return;
3637 } 3867 }
3638 3868
3639 my $value = uuid_str $value + $uuid_skip; 3869 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3870 $uuid_skip = 0;
… …
3650 or return; 3880 or return;
3651 3881
3652 aio_rename "$uuid~", $uuid 3882 aio_rename "$uuid~", $uuid
3653 and return; 3883 and return;
3654 3884
3655 warn "uuid file written ($value).\n"; 3885 trace "uuid file written ($value).\n";
3656 3886
3657 1 3887 1
3658 3888
3659} 3889}
3660 3890
… …
3666} 3896}
3667 3897
3668sub emergency_save() { 3898sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3899 my $freeze_guard = cf::freeze_mainloop;
3670 3900
3671 warn "emergency_perl_save: enter\n"; 3901 info "emergency_perl_save: enter\n";
3902
3903 # this is a trade-off: we want to be very quick here, so
3904 # save all maps without fsync, and later call a global sync
3905 # (which in turn might be very very slow)
3906 local $USE_FSYNC = 0;
3672 3907
3673 cf::sync_job { 3908 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3909 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3910
3679 # use a peculiar iteration method to avoid tripping on perl 3911 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3912 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3913 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3914 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3915 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3916 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3917 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3918 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3919 $pl->save;
3688 } 3920 }
3689 warn "emergency_perl_save: end player save\n"; 3921 info "emergency_perl_save: end player save\n";
3690 3922
3923 cf::write_runtime_sync; # external watchdog should not bark
3924
3691 warn "emergency_perl_save: begin map save\n"; 3925 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3926 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3927 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3928 $map->valid or next;
3695 $map->save; 3929 $map->save;
3696 } 3930 }
3697 warn "emergency_perl_save: end map save\n"; 3931 info "emergency_perl_save: end map save\n";
3698 3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3934
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3935 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3936 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3937 info "emergency_perl_save: end database checkpoint\n";
3702 3938
3703 warn "emergency_perl_save: begin write uuid\n"; 3939 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3940 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3941 info "emergency_perl_save: end write uuid\n";
3942
3943 cf::write_runtime_sync; # external watchdog should not bark
3944
3945 trace "emergency_perl_save: syncing database to disk";
3946 BDB::db_env_txn_checkpoint $DB_ENV;
3947
3948 info "emergency_perl_save: starting sync\n";
3949 IO::AIO::aio_sync sub {
3950 info "emergency_perl_save: finished sync\n";
3951 };
3952
3953 cf::write_runtime_sync; # external watchdog should not bark
3954
3955 trace "emergency_perl_save: flushing outstanding aio requests";
3956 while (IO::AIO::nreqs || BDB::nreqs) {
3957 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3958 }
3959
3960 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3961 };
3707 3962
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3963 info "emergency_perl_save: leave\n";
3714} 3964}
3715 3965
3716sub post_cleanup { 3966sub post_cleanup {
3717 my ($make_core) = @_; 3967 my ($make_core) = @_;
3718 3968
3969 IO::AIO::flush;
3970
3719 warn Carp::longmess "post_cleanup backtrace" 3971 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3972 if $make_core;
3721 3973
3722 my $fh = pidfile; 3974 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3975 unlink $PIDFILE if <$fh> == $$;
3724} 3976}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3996 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3997 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3998 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3999# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 4000 }
3749 warn "cleared package $pkg\n";#d#
3750} 4001}
3751 4002
3752sub do_reload_perl() { 4003sub do_reload_perl() {
3753 # can/must only be called in main 4004 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 4005 unless (in_main) {
3755 warn "can only reload from main coroutine"; 4006 error "can only reload from main coroutine";
3756 return; 4007 return;
3757 } 4008 }
3758 4009
3759 return if $RELOAD++; 4010 return if $RELOAD++;
3760 4011
3761 my $t1 = EV::time; 4012 my $t1 = AE::time;
3762 4013
3763 while ($RELOAD) { 4014 while ($RELOAD) {
3764 warn "reloading..."; 4015 cf::get_slot 0.1, -1, "reload_perl";
4016 info "perl_reload: reloading...";
3765 4017
3766 warn "entering sync_job"; 4018 trace "perl_reload: entering sync_job";
3767 4019
3768 cf::sync_job { 4020 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 4021 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 4022
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 4023 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 4024 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 4025 %EXT_CORO = ();
3786 4026
3787 warn "removing commands"; 4027 trace "perl_reload: removing commands";
3788 %COMMAND = (); 4028 %COMMAND = ();
3789 4029
3790 warn "removing ext/exti commands"; 4030 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 4031 %EXTCMD = ();
3792 %EXTICMD = (); 4032 %EXTICMD = ();
3793 4033
3794 warn "unloading/nuking all extensions"; 4034 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 4035 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 4036 trace "... unloading $pkg";
3797 4037
3798 if (my $cb = $pkg->can ("unload")) { 4038 if (my $cb = $pkg->can ("unload")) {
3799 eval { 4039 eval {
3800 $cb->($pkg); 4040 $cb->($pkg);
3801 1 4041 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 4042 } or error "$pkg unloaded, but with errors: $@";
3803 } 4043 }
3804 4044
3805 warn "... clearing $pkg"; 4045 trace "... clearing $pkg";
3806 clear_package $pkg; 4046 clear_package $pkg;
3807 } 4047 }
3808 4048
3809 warn "unloading all perl modules loaded from $LIBDIR"; 4049 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 4050 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 4052
3813 warn "... unloading $k"; 4053 trace "... unloading $k";
3814 delete $INC{$k}; 4054 delete $INC{$k};
3815 4055
3816 $k =~ s/\.pm$//; 4056 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 4057 $k =~ s/\//::/g;
3818 4058
… …
3821 } 4061 }
3822 4062
3823 clear_package $k; 4063 clear_package $k;
3824 } 4064 }
3825 4065
3826 warn "getting rid of safe::, as good as possible"; 4066 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 4067 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4068 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 4069
3830 warn "unloading cf.pm \"a bit\""; 4070 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 4071 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4072 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 4073
3834 # don't, removes xs symbols, too, 4074 # don't, removes xs symbols, too,
3835 # and global variables created in xs 4075 # and global variables created in xs
3836 #clear_package __PACKAGE__; 4076 #clear_package __PACKAGE__;
3837 4077
3838 warn "unload completed, starting to reload now"; 4078 info "perl_reload: unload completed, starting to reload now";
3839 4079
3840 warn "reloading cf.pm"; 4080 trace "perl_reload: reloading cf.pm";
3841 require cf; 4081 require cf;
3842 cf::_connect_to_perl_1; 4082 cf::_connect_to_perl_1;
3843 4083
3844 warn "loading config and database again"; 4084 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 4085 cf::reload_config;
3846 4086
3847 warn "loading extensions"; 4087 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 4088 cf::load_extensions;
3849 4089
3850 if ($REATTACH_ON_RELOAD) { 4090 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 4091 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 4092 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 4093 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 4094 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 4095 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 4096 reattach $_ for values %PLAYER;
3857 } 4097 }
3858 4098
3859 warn "running post_init jobs"; 4099 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 4100
3862 warn "leaving sync_job"; 4101 trace "perl_reload: leaving sync_job";
3863 4102
3864 1 4103 1
3865 } or do { 4104 } or do {
3866 warn $@; 4105 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4106 cf::cleanup "perl_reload: error, exiting.";
3868 }; 4107 };
3869 4108
3870 warn "reloaded";
3871 --$RELOAD; 4109 --$RELOAD;
3872 } 4110 }
3873 4111
3874 $t1 = EV::time - $t1; 4112 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4113 info "perl_reload: completed in ${t1}s\n";
3876}; 4114};
3877 4115
3878our $RELOAD_WATCHER; # used only during reload 4116our $RELOAD_WATCHER; # used only during reload
3879 4117
3880sub reload_perl() { 4118sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4120 # coro crashes during coro_state_free->destroy here.
3883 4121
3884 $RELOAD_WATCHER ||= cf::async { 4122 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4123 Coro::AIO::aio_wait cache_extensions;
3886 4124
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4125 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4126 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4127 undef $RELOAD_WATCHER;
3890 }; 4128 };
3891 }; 4129 };
3892} 4130}
… …
3901 reload_perl; 4139 reload_perl;
3902 }; 4140 };
3903 } 4141 }
3904}; 4142};
3905 4143
3906unshift @INC, $LIBDIR; 4144#############################################################################
3907 4145
3908my $bug_warning = 0; 4146my $bug_warning = 0;
3909 4147
3910our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN;
3912
3913sub wait_for_tick { 4148sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4149 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3915 4150
3916 my $signal = new Coro::Signal; 4151 $WAIT_FOR_TICK->wait;
3917 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait;
3919} 4152}
3920 4153
3921sub wait_for_tick_begin { 4154sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4155 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3923 4156
3924 my $signal = new Coro::Signal; 4157 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4158 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4159 $signal->wait;
3927} 4160}
… …
3931 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4164 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3932 unless ++$bug_warning > 10; 4165 unless ++$bug_warning > 10;
3933 return; 4166 return;
3934 } 4167 }
3935 4168
3936 cf::server_tick; # one server iteration 4169 cf::one_tick; # one server iteration
3937 4170
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4171 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4172
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4173 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4174 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4175 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4176 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4177 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4178 or error "ERROR: unable to write runtime file: $!";
3946 }; 4179 };
3947 } 4180 }
3948 4181
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4182 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4183 $sig->send;
3951 } 4184 }
3952 while (my $sig = shift @WAIT_FOR_TICK) { 4185 $WAIT_FOR_TICK->broadcast;
3953 $sig->send;
3954 }
3955 4186
3956 $LOAD = ($NOW - $TICK_START) / $TICK; 4187 $LOAD = ($NOW - $TICK_START) / $TICK;
3957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4188 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3958 4189
3959 if (0) { 4190 if (0) {
3960 if ($NEXT_TICK) { 4191 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4192 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4193 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4194 debug "jitter $JITTER\n";#d#
3964 } 4195 }
3965 } 4196 }
3966} 4197}
3967 4198
3968{ 4199{
3969 # configure BDB 4200 # configure BDB
3970 4201
3971 BDB::min_parallel 16; 4202 BDB::min_parallel 16;
3972 BDB::max_poll_reqs $TICK * 0.1; 4203 BDB::max_poll_reqs $TICK * 0.1;
3973 $AnyEvent::BDB::WATCHER->priority (1); 4204 #$AnyEvent::BDB::WATCHER->priority (1);
3974 4205
3975 unless ($DB_ENV) { 4206 unless ($DB_ENV) {
3976 $DB_ENV = BDB::db_env_create; 4207 $DB_ENV = BDB::db_env_create;
3977 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4208 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4209 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4013 IO::AIO::min_parallel 8; 4244 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4245 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4246 undef $AnyEvent::AIO::WATCHER;
4016} 4247}
4017 4248
4018my $_log_backtrace; 4249our $_log_backtrace;
4250our $_log_backtrace_last;
4019 4251
4020sub _log_backtrace { 4252sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4253 my ($msg, @addr) = @_;
4022 4254
4023 $msg =~ s/\n//; 4255 $msg =~ s/\n$//;
4024 4256
4257 if ($_log_backtrace_last eq $msg) {
4258 LOG llevInfo, "[ABT] $msg\n";
4259 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4260 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4261 } elsif ($_log_backtrace < 2) {
4262 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4263 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4264 my $perl_bt = Carp::longmess $msg;
4029 async { 4265 async {
4030 $Coro::current->{desc} = "abt $msg"; 4266 $Coro::current->{desc} = "abt $msg";
4031 4267
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4287 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4288 --$_log_backtrace;
4053 }; 4289 };
4054 } else { 4290 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4291 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4292 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4293 }
4058} 4294}
4059 4295
4060# load additional modules 4296# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4297require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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