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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 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.
… …
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;
1402 } 1586 }
1403 1587
1588 my $pass = 0;
1404 my %done; 1589 my %done;
1405 while (%todo) { 1590 while (%todo) {
1406 my $progress; 1591 my $progress;
1407 1592
1593 ++$pass;
1594
1595 ext:
1408 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1598 next ext
1411 unless exists $done{$_}; 1599 unless exists $done{$_};
1412 } 1600 }
1413 1601
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1603
1416 unless (eval $v->{source}) { 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
1613 my $active = eval $source;
1614
1615 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1617
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1619 if exists $v->{meta}{mandatory};
1424 1620
1425 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1426 } 1630 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1631 }
1432 1632
1433 skip: 1633 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1436 } 1643 }
1437 }; 1644 };
1438} 1645}
1439 1646
1440############################################################################# 1647#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1525 } 1732 }
1526 } 1733 }
1527} 1734}
1528 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
1529sub save($) { 1749sub save($) {
1530 my ($pl) = @_; 1750 my ($pl) = @_;
1531 1751
1532 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1533 1753
… …
1538 1758
1539 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1541 1761
1542 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];
1543 1766
1544 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1768 cf::cede_to_tick;
1546} 1769}
1547 1770
… …
1581 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1582 1805
1583 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1584 $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
1585 1808
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1810 $pl->deactivate;
1811
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1591 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1592 1817
1593 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1649 \@logins 1874 \@logins
1650} 1875}
1651 1876
1652=item $player->maps 1877=item $player->maps
1653 1878
1879=item cf::player::maps $login
1880
1654Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1655player. May block. 1882player. May block.
1656 1883
1657=cut 1884=cut
1658 1885
… …
1720=cut 1947=cut
1721 1948
1722sub find_by_path($) { 1949sub find_by_path($) {
1723 my ($path) = @_; 1950 my ($path) = @_;
1724 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1725 my ($match, $specificity); 1954 my ($match, $specificity);
1726 1955
1727 for my $region (list) { 1956 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
… …
1757sub generate_random_map { 1986sub generate_random_map {
1758 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1759 1988
1760 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
1761 1990
1762 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774 (cf::region::find $rmp->{region}), $rmp->{custom}
1775 )
1776} 1992}
1777 1993
1778=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1779 1995
1780Register 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
… …
1785 2001
1786sub register { 2002sub register {
1787 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 2004 my $pkg = caller;
1789 2005
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 2007
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 2009}
1795 2010
1796# also paths starting with '/' 2011# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 2013
1799sub thawer_merge { 2014sub thawer_merge {
1800 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1801 2016
1802 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
… …
1807} 2022}
1808 2023
1809sub normalise { 2024sub normalise {
1810 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1811 2026
1812 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1813 2028
1814 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1815 2030
1816 # map plan: 2031 # map plan:
1817 # 2032 #
… …
1832 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 2048 $path = "$base/$path";
1834 } 2049 }
1835 2050
1836 for ($path) { 2051 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1840 } 2054 }
1841 2055
1842 $path 2056 $path
… …
1856 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1857 return $self; 2071 return $self;
1858 } 2072 }
1859 } 2073 }
1860 2074
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 2076 ()
1863} 2077}
1864 2078
2079# may re-bless or do other evil things
1865sub init { 2080sub init {
1866 my ($self) = @_; 2081 my ($self) = @_;
1867 2082
1868 $self 2083 $self
1869} 2084}
… …
1934 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1935 2150
1936 1 2151 1
1937} 2152}
1938 2153
2154# used to laod the header of an original map
1939sub load_header_orig { 2155sub load_header_orig {
1940 my ($self) = @_; 2156 my ($self) = @_;
1941 2157
1942 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1943} 2159}
1944 2160
2161# used to laod the header of an instantiated map
1945sub load_header_temp { 2162sub load_header_temp {
1946 my ($self) = @_; 2163 my ($self) = @_;
1947 2164
1948 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1949} 2166}
1950 2167
2168# called after loading the header from an instantiated map
1951sub prepare_temp { 2169sub prepare_temp {
1952 my ($self) = @_; 2170 my ($self) = @_;
1953 2171
1954 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1956 # safety 2174 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2177}
1960 2178
2179# called after loading the header from an original map
1961sub prepare_orig { 2180sub prepare_orig {
1962 my ($self) = @_; 2181 my ($self) = @_;
1963 2182
1964 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
1989 2208
1990sub find; 2209sub find;
1991sub find { 2210sub find {
1992 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1993 2212
2213 cf::cede_to_tick;
2214
1994 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1995 2216
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2219
1999 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2030 2251
2031 { 2252 {
2032 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2033 2254
2034 return unless $self->valid; 2255 return unless $self->valid;
2035 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2036
2037 $self->in_memory (cf::MAP_LOADING);
2038 2257
2039 $self->alloc; 2258 $self->alloc;
2040 2259
2041 $self->pre_load; 2260 $self->pre_load;
2042 cf::cede_to_tick; 2261 cf::cede_to_tick;
2043 2262
2263 if (exists $self->{load_path}) {
2044 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block; 2265 $f->skip_block;
2046 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2047 or return; 2267 or return;
2048 2268
2049 $self->post_load_original 2269 $self->post_load_original
2050 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2051 2271
2052 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2053 utf8::encode $uniq; 2273 utf8::encode $uniq;
2054 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2056 $self->clear_unique_items; 2276 $self->clear_unique_items;
2057 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2059 } 2280 }
2060 } 2281 }
2061 }
2062 2282
2063 $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);
2064 2290
2065 cf::cede_to_tick; 2291 cf::cede_to_tick;
2066 # now do the right thing for maps 2292 # now do the right thing for maps
2067 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2068 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2072 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2299 $self->decay_objects;
2074 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2075 $self->update_buttons; 2301 $self->update_buttons;
2076 cf::cede_to_tick; 2302 cf::cede_to_tick;
2077 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2078 } 2304 }
2079 2305
2080 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2082
2083 $self->in_memory (cf::MAP_ACTIVE);
2084 } 2308 }
2085 2309
2086 $self->post_load; 2310 $self->post_load;
2087}
2088 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2089sub customise_for { 2318sub customise_for {
2090 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2091 2320
2092 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2322 if $self->per_player;
… …
2096# if $self->per_party; 2325# if $self->per_party;
2097 2326
2098 $self 2327 $self
2099} 2328}
2100 2329
2101# find and load all maps in the 3x3 area around a map
2102sub load_neighbours {
2103 my ($map) = @_;
2104
2105 my @neigh; # diagonal neighbours
2106
2107 for (0 .. 3) {
2108 my $neigh = $map->tile_path ($_)
2109 or next;
2110 $neigh = find $neigh, $map
2111 or next;
2112 $neigh->load;
2113
2114 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 }
2118
2119 for (grep defined $_->[0], @neigh) {
2120 my ($path, $origin) = @$_;
2121 my $neigh = find $path, $origin
2122 or next;
2123 $neigh->load;
2124 }
2125}
2126
2127sub find_sync { 2330sub find_sync {
2128 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2129 2332
2130 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
2131} 2338}
2132 2339
2133sub do_load_sync { 2340sub do_load_sync {
2134 my ($map) = @_; 2341 my ($map) = @_;
2135 2342
2343 # it's a bug to call this from the main context
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2138 2346
2139 cf::sync_job { $map->load }; 2347 $map->load;
2140} 2348}
2141 2349
2142our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2144 2352
2145sub find_async { 2353sub find_async {
2146 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2147 2355
2148 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2149 2357
2150 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2152 } 2360 }
2153 2361
2154 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2155 2363
2156 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2170 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2171 2379
2172 () 2380 ()
2173} 2381}
2174 2382
2383# common code, used by both ->save and ->swapout
2175sub save { 2384sub _save {
2176 my ($self) = @_; 2385 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2386
2180 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2181 2388
2182 return unless $self->dirty; 2389 return unless $self->dirty;
2183 2390
… …
2203 } else { 2410 } else {
2204 $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);
2205 } 2412 }
2206} 2413}
2207 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2208sub swap_out { 2423sub swap_out {
2209 my ($self) = @_; 2424 my ($self) = @_;
2210 2425
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2216 return if $self->players; 2430 return if $self->players;
2217 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
2218 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2219 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
2220 $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};
2221 2482
2222 $self->deactivate; 2483 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2485 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2486
2270 $self->unlink_save; 2487 $self->unlink_save;
2271 $self->destroy; 2488 $self->destroy;
2272} 2489}
2273 2490
… …
2281 2498
2282 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2283 2500
2284 $self->unlink_save; 2501 $self->unlink_save;
2285 2502
2286 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2508
… …
2521 2738
2522Freezes 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}>).
2523 2740
2524The 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.
2525for 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,
2526though, 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
2527map. 2744map.
2528 2745
2529Will never block. 2746Will never block.
2530 2747
2531=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2553 my ($self) = @_; 2770 my ($self) = @_;
2554 2771
2555 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2556 2773
2774 ++$self->{_link_recursion};
2775
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2777
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2561 2780
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2782}
2564 2783
2565sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2567 2786
… …
2587 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2588 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2589 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2590 2809
2591 $map->load; 2810 $map->load;
2592 $map->load_neighbours;
2593 2811
2594 return unless $self->contr->active; 2812 return unless $self->contr->active;
2595 2813
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2598 2816 # entering was successful
2817 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2819 $self->activate_recursive;
2601} 2820 }
2602 2821
2822}
2823
2603=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)]])
2604 2825
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
… …
2615 2836
2616our $GOTOGEN; 2837our $GOTOGEN;
2617 2838
2618sub cf::object::player::goto { 2839sub cf::object::player::goto {
2619 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 }
2620 2847
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2850
2624 $self->enter_link; 2851 $self->enter_link;
… …
2644 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2645 } 2872 }
2646 } 2873 }
2647 2874
2648 my $map = eval { 2875 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650 2877
2651 if ($map) { 2878 if ($map) {
2652 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2881 } else {
2655 $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);
2656 } 2883 }
2657 2884
2658 $map 2885 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2669 } 2896 }
2670 2897
2671 $done->() if $done; 2898 $done->($self) if $done;
2672 })->prio (1); 2899 })->prio (1);
2673} 2900}
2674 2901
2675=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2676 2903
… …
2744 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2745 2972
2746 unless (eval { 2973 unless (eval {
2747 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2748 2975
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2758 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2759 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 }
2760 3002
2761 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2762 3004
2763 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "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. "
2771 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2773 3015
2774 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 3017 $self->leave_link;
2776 } 3018 }
2777 })->prio (1); 3019 })->prio (1);
2778} 3020}
2779 3021
… …
3006=cut 3248=cut
3007 3249
3008sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3009 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3010 3252
3011 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3012 $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]));
3013 } elsif ($self->extcmd == 1) {
3014 #TODO: version 1, remove
3015 unshift @msg, msgtype => "reply", msgid => $id;
3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3017 }
3018} 3256}
3019 3257
3020=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3021 3259
3022Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3077 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3078 3316
3079 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3080 3318
3081 if (ref $msg) { 3319 if (ref $msg) {
3082 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3083 "ARRAY" eq ref $msg
3084 ? @$msg
3085 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3086 3321
3087 my @reply; 3322 my @reply;
3088 3323
3089 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3090 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3092 3327
3093 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3329 if $reply;
3095 3330
3096 } else { 3331 } else {
3097 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";
3098 } 3333 }
3099 3334
3100 cf::override; 3335 cf::override;
3101 }, 3336 },
3102); 3337);
… …
3122 3357
3123 $coro 3358 $coro
3124} 3359}
3125 3360
3126cf::client->attach ( 3361cf::client->attach (
3127 on_destroy => sub { 3362 on_client_destroy => sub {
3128 my ($ns) = @_; 3363 my ($ns) = @_;
3129 3364
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3366 },
3132); 3367);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3187) { 3422) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3425 for @funs;
3192} 3426}
3193 3427
… …
3232 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3468 }
3235 3469
3236 if ($@) { 3470 if ($@) {
3237 warn "$@"; 3471 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3240 } 3474 }
3241 3475
3242 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3243} 3477}
3244 3478
… …
3278 # for this (global event?) 3512 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3514
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3516
3283 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3284 3518
3285 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3286 0 < aio_load $path, $facedata
3287 or die "$path: $!";
3288
3289 $facedata = Coro::Storable::thaw $facedata;
3290 3520
3291 $facedata->{version} == 2 3521 $facedata->{version} == 2
3292 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3293 3523
3294 # patch in the exptable 3524 # patch in the exptable
… …
3308 3538
3309 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3310 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3542 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3543 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3313 3544
3314 cf::cede_to_tick; 3545 cf::cede_to_tick;
3315 } 3546 }
3316 3547
3317 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3322 3553
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3557 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3559 }
3329 3560
3330 cf::cede_to_tick; 3561 cf::cede_to_tick;
3331 } 3562 }
3332 } 3563 }
… …
3344 3575
3345 { 3576 {
3346 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3347 3578
3348 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) { 3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3583
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3585 cf::face::set_type $idx, $type;
3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3354 } else { 3587 } else {
3355 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3356 } 3589 }
3357 3590
3358 cf::cede_to_tick; 3591 cf::cede_to_tick;
3359 } 3592 }
3360 } 3593 }
3361 3594
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3596
3364 1 3597 1
3365} 3598}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3599
3387register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3389 3602
3390 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3642sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3432} 3645}
3433 3646
3647sub reload_sound {
3648 trace "loading sound config from $DATADIR/sound\n";
3649
3650 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3651
3652 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3653 my $sound = $soundconf->{compat}[$_]
3654 or next;
3655
3656 my $face = cf::face::find "sound/$sound->[1]";
3657 cf::sound::set $sound->[0] => $face;
3658 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3659 }
3660
3661 while (my ($k, $v) = each %{$soundconf->{event}}) {
3662 my $face = cf::face::find "sound/$v";
3663 cf::sound::set $k => $face;
3664 }
3665}
3666
3434sub reload_resources { 3667sub reload_resources {
3435 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3436 3669
3670 reload_exp_table;
3671 reload_materials;
3437 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3438 reload_archetypes; 3674 reload_archetypes;
3439 reload_regions; 3675 reload_regions;
3440 reload_treasures; 3676 reload_treasures;
3441 3677
3442 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3443} 3679}
3444 3680
3445sub reload_config { 3681sub reload_config {
3446 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3447 3683
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3449 or return; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3450 3687
3451 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>;
3453
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3689
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3690 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3691 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3692
3459 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
… …
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3697 };
3464 warn $@ if $@; 3698 warn $@ if $@;
3465 } 3699 }
3466
3467 warn "finished reloading resource files\n";
3468} 3700}
3469 3701
3470sub pidfile() { 3702sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3486 print $fh $$; 3718 print $fh $$;
3487} 3719}
3488 3720
3489sub main_loop { 3721sub main_loop {
3490 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3491 if (1) { 3723 if (1) {
3492 EV::loop; 3724 EV::loop;
3493 } 3725 }
3494 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3496} 3728}
3497 3729
3498sub main { 3730sub main {
3499 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3500 3732
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3734 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3737
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3738 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3739
3513 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
… …
3520 }; 3747 };
3521 3748
3522 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3523 3750
3524 cf::sync_job { 3751 cf::sync_job {
3752 cf::incloader::init ();
3753
3754 cf::init_anim;
3755 cf::init_attackmess;
3756 cf::init_dynamic;
3757
3525 cf::load_settings; 3758 cf::load_settings;
3526 cf::load_materials;
3527 3759
3528 reload_resources; 3760 reload_resources;
3529 reload_config; 3761 reload_config;
3530 db_init; 3762 db_init;
3531 3763
3532 cf::init_uuid; 3764 cf::init_uuid;
3533 cf::init_signals; 3765 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3766 cf::init_skills;
3536 3767
3537 cf::init_beforeplay; 3768 cf::init_beforeplay;
3538 3769
3539 atomic; 3770 atomic;
… …
3544 3775
3545 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3777 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3778 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3779
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3550 }; 3781 };
3551 3782
3783 cf::object::thawer::errors_are_fatal 0;
3784 info "parse errors in files are no longer fatal from this point on.\n";
3785
3786 AE::postpone {
3787 undef &main; # free gobs of memory :)
3788 };
3789
3552 main_loop; 3790 goto &main_loop;
3553} 3791}
3554 3792
3555############################################################################# 3793#############################################################################
3556# initialisation and cleanup 3794# initialisation and cleanup
3557 3795
3558# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3559BEGIN { 3797BEGIN {
3560 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3564 }; 3802 };
3565 } 3803 }
3566} 3804}
3567 3805
3568sub write_runtime_sync { 3806sub write_runtime_sync {
3807 my $t0 = AE::time;
3808
3569 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3571 3811
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3813
3574 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3575 3815
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3817 or return;
3578 3818
3579 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3834 or return;
3595 3835
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3837 and return;
3598 3838
3599 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3840
3601 1 3841 1
3602} 3842}
3603 3843
3604our $uuid_lock; 3844our $uuid_lock;
… …
3616 or return; 3856 or return;
3617 3857
3618 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3619 3859
3620 unless ($value) { 3860 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3862 return;
3623 } 3863 }
3624 3864
3625 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3636 or return; 3876 or return;
3637 3877
3638 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3639 and return; 3879 and return;
3640 3880
3641 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3642 3882
3643 1 3883 1
3644 3884
3645} 3885}
3646 3886
… …
3652} 3892}
3653 3893
3654sub emergency_save() { 3894sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3656 3896
3657 warn "emergency_perl_save: enter\n"; 3897 info "emergency_perl_save: enter\n";
3898
3899 # this is a trade-off: we want to be very quick here, so
3900 # save all maps without fsync, and later call a global sync
3901 # (which in turn might be very very slow)
3902 local $USE_FSYNC = 0;
3658 3903
3659 cf::sync_job { 3904 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3906
3665 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3913 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3915 $pl->save;
3674 } 3916 }
3675 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3676 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3677 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3924 $map->valid or next;
3681 $map->save; 3925 $map->save;
3682 } 3926 }
3683 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3684 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3688 3934
3689 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3936 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 3937 info "emergency_perl_save: end write uuid\n";
3938
3939 cf::write_runtime_sync; # external watchdog should not bark
3940
3941 trace "emergency_perl_save: syncing database to disk";
3942 BDB::db_env_txn_checkpoint $DB_ENV;
3943
3944 info "emergency_perl_save: starting sync\n";
3945 IO::AIO::aio_sync sub {
3946 info "emergency_perl_save: finished sync\n";
3947 };
3948
3949 cf::write_runtime_sync; # external watchdog should not bark
3950
3951 trace "emergency_perl_save: flushing outstanding aio requests";
3952 while (IO::AIO::nreqs || BDB::nreqs) {
3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3954 }
3955
3956 cf::write_runtime_sync; # external watchdog should not bark
3692 }; 3957 };
3693 3958
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3700} 3960}
3701 3961
3702sub post_cleanup { 3962sub post_cleanup {
3703 my ($make_core) = @_; 3963 my ($make_core) = @_;
3704 3964
3965 IO::AIO::flush;
3966
3705 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3968 if $make_core;
3707 3969
3708 my $fh = pidfile; 3970 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3710} 3972}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3996 }
3735 warn "cleared package $pkg\n";#d#
3736} 3997}
3737 3998
3738sub do_reload_perl() { 3999sub do_reload_perl() {
3739 # can/must only be called in main 4000 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3741 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3742 return; 4003 return;
3743 } 4004 }
3744 4005
3745 return if $RELOAD++; 4006 return if $RELOAD++;
3746 4007
3747 my $t1 = EV::time; 4008 my $t1 = AE::time;
3748 4009
3749 while ($RELOAD) { 4010 while ($RELOAD) {
3750 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3751 4013
3752 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3753 4015
3754 cf::sync_job { 4016 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 4017 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 4018
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 4021 %EXT_CORO = ();
3772 4022
3773 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3774 %COMMAND = (); 4024 %COMMAND = ();
3775 4025
3776 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 4027 %EXTCMD = ();
3778 %EXTICMD = (); 4028 %EXTICMD = ();
3779 4029
3780 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3783 4033
3784 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3785 eval { 4035 eval {
3786 $cb->($pkg); 4036 $cb->($pkg);
3787 1 4037 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3789 } 4039 }
3790 4040
3791 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3792 clear_package $pkg; 4042 clear_package $pkg;
3793 } 4043 }
3794 4044
3795 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 4048
3799 warn "... unloading $k"; 4049 trace "... unloading $k";
3800 delete $INC{$k}; 4050 delete $INC{$k};
3801 4051
3802 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3804 4054
… …
3807 } 4057 }
3808 4058
3809 clear_package $k; 4059 clear_package $k;
3810 } 4060 }
3811 4061
3812 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 4063 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4064 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 4065
3816 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 4069
3820 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3821 # and global variables created in xs 4071 # and global variables created in xs
3822 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3823 4073
3824 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3825 4075
3826 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3827 require cf; 4077 require cf;
3828 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3829 4079
3830 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 4081 cf::reload_config;
3832 4082
3833 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 4084 cf::load_extensions;
3835 4085
3836 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3843 } 4093 }
3844 4094
3845 warn "running post_init jobs"; 4095 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 4096
3848 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3849 4098
3850 1 4099 1
3851 } or do { 4100 } or do {
3852 warn $@; 4101 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4103 };
3855 4104
3856 warn "reloaded";
3857 --$RELOAD; 4105 --$RELOAD;
3858 } 4106 }
3859 4107
3860 $t1 = EV::time - $t1; 4108 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3862}; 4110};
3863 4111
3864our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3865 4113
3866sub reload_perl() { 4114sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3869 4117
3870 $RELOAD_WATCHER ||= cf::async { 4118 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4119 Coro::AIO::aio_wait cache_extensions;
3872 4120
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4122 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
3876 }; 4124 };
3877 }; 4125 };
3878} 4126}
… …
3887 reload_perl; 4135 reload_perl;
3888 }; 4136 };
3889 } 4137 }
3890}; 4138};
3891 4139
3892unshift @INC, $LIBDIR; 4140#############################################################################
3893 4141
3894my $bug_warning = 0; 4142my $bug_warning = 0;
3895 4143
3896our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN;
3898
3899sub wait_for_tick { 4144sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3901 4146
3902 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3903 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait;
3905} 4148}
3906 4149
3907sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3909 4152
3910 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4155 $signal->wait;
3913} 4156}
… …
3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4160 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3918 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3919 return; 4162 return;
3920 } 4163 }
3921 4164
3922 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
3923 4166
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4168
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4171 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4173 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3932 }; 4175 };
3933 } 4176 }
3934 4177
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4179 $sig->send;
3937 } 4180 }
3938 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3939 $sig->send;
3940 }
3941 4182
3942 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3944 4185
3945 if (0) { 4186 if (0) {
3946 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3950 } 4191 }
3951 } 4192 }
3952} 4193}
3953 4194
3954{ 4195{
3955 # configure BDB 4196 # configure BDB
3956 4197
3957 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3960 4201
3961 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
3999 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4002} 4243}
4003 4244
4004my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4005 4247
4006sub _log_backtrace { 4248sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4008 4250
4009 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4010 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4259 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4015 async { 4261 async {
4016 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4017 4263
… …
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4284 --$_log_backtrace;
4039 }; 4285 };
4040 } else { 4286 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4289 }
4044} 4290}
4045 4291
4046# load additional modules 4292# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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