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.512 by root, Sun Apr 11 04:52:07 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 = AE::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) {
… …
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
… …
1328 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1329 1501
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1503
1332 if (ref $msg) { 1504 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1506
1338 my @reply; 1507 my @reply;
1339 1508
1340 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1343 1512
1344 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1514 if $reply;
1346 1515
1347 } else { 1516 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1518 }
1350 1519
1351 cf::override; 1520 cf::override;
1352 }, 1521 },
1353); 1522);
… …
1363 }; 1532 };
1364 1533
1365 $grp 1534 $grp
1366} 1535}
1367 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1368sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1369 cf::sync_job { 1553 cf::sync_job {
1370 my %todo; 1554 my %todo;
1371 1555
1372 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1557 next unless -r $path;
… …
1391 1575
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1578
1395 $ext{source} = 1579 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1398 . $source 1582 . $source
1399 . "\n};\n1"; 1583 . "\n};\n1";
1400 1584
1401 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1598 next ext
1415 unless exists $done{$_}; 1599 unless exists $done{$_};
1416 } 1600 }
1417 1601
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1420 my $active = eval $v->{source}; 1613 my $active = eval $source;
1421 1614
1422 if (length $@) { 1615 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1424 1617
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1619 if exists $v->{meta}{mandatory};
1620
1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1427 } else { 1623 } else {
1428 $done{$k} = delete $todo{$k}; 1624 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1625 push @EXTS, $v->{pkg};
1430 $progress = 1; 1626 $progress = 1;
1431 1627
1432 warn "$v->{base}: extension inactive.\n" 1628 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1629 unless $active;
1434 } 1630 }
1435 } 1631 }
1436 1632
1437 unless ($progress) { 1633 unless ($progress) {
… …
1439 1635
1440 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1443 } 1639 }
1640
1641 last;
1444 } 1642 }
1445 } 1643 }
1446 }; 1644 };
1447} 1645}
1448 1646
… …
1606 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1607 1805
1608 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1609 $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
1610 1808
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1810 $pl->deactivate;
1811
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1616 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1617 1817
1618 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1674 \@logins 1874 \@logins
1675} 1875}
1676 1876
1677=item $player->maps 1877=item $player->maps
1678 1878
1879=item cf::player::maps $login
1880
1679Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1680player. May block. 1882player. May block.
1681 1883
1682=cut 1884=cut
1683 1885
… …
1745=cut 1947=cut
1746 1948
1747sub find_by_path($) { 1949sub find_by_path($) {
1748 my ($path) = @_; 1950 my ($path) = @_;
1749 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1750 my ($match, $specificity); 1954 my ($match, $specificity);
1751 1955
1752 for my $region (list) { 1956 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
… …
1782sub generate_random_map { 1986sub generate_random_map {
1783 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1784 1988
1785 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
1786 1990
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1992}
1802 1993
1803=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1804 1995
1805Register 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
… …
1810 2001
1811sub register { 2002sub register {
1812 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2004 my $pkg = caller;
1814 2005
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2007
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2009}
1820 2010
1821# also paths starting with '/' 2011# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2013
1824sub thawer_merge { 2014sub thawer_merge {
1825 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1826 2016
1827 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
… …
1832} 2022}
1833 2023
1834sub normalise { 2024sub normalise {
1835 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1836 2026
1837 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1838 2028
1839 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1840 2030
1841 # map plan: 2031 # map plan:
1842 # 2032 #
… …
1857 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2048 $path = "$base/$path";
1859 } 2049 }
1860 2050
1861 for ($path) { 2051 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1865 } 2054 }
1866 2055
1867 $path 2056 $path
… …
1881 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1882 return $self; 2071 return $self;
1883 } 2072 }
1884 } 2073 }
1885 2074
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2076 ()
1888} 2077}
1889 2078
2079# may re-bless or do other evil things
1890sub init { 2080sub init {
1891 my ($self) = @_; 2081 my ($self) = @_;
1892 2082
1893 $self 2083 $self
1894} 2084}
… …
1959 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1960 2150
1961 1 2151 1
1962} 2152}
1963 2153
2154# used to laod the header of an original map
1964sub load_header_orig { 2155sub load_header_orig {
1965 my ($self) = @_; 2156 my ($self) = @_;
1966 2157
1967 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1968} 2159}
1969 2160
2161# used to laod the header of an instantiated map
1970sub load_header_temp { 2162sub load_header_temp {
1971 my ($self) = @_; 2163 my ($self) = @_;
1972 2164
1973 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1974} 2166}
1975 2167
2168# called after loading the header from an instantiated map
1976sub prepare_temp { 2169sub prepare_temp {
1977 my ($self) = @_; 2170 my ($self) = @_;
1978 2171
1979 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1980 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1981 # safety 2174 # safety
1982 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1983 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1984} 2177}
1985 2178
2179# called after loading the header from an original map
1986sub prepare_orig { 2180sub prepare_orig {
1987 my ($self) = @_; 2181 my ($self) = @_;
1988 2182
1989 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1990 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2014 2208
2015sub find; 2209sub find;
2016sub find { 2210sub find {
2017 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2018 2212
2213 cf::cede_to_tick;
2214
2019 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2020 2216
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2023 2219
2024 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2055 2251
2056 { 2252 {
2057 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2058 2254
2059 return unless $self->valid; 2255 return unless $self->valid;
2060 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2061
2062 $self->in_memory (cf::MAP_LOADING);
2063 2257
2064 $self->alloc; 2258 $self->alloc;
2065 2259
2066 $self->pre_load; 2260 $self->pre_load;
2067 cf::cede_to_tick; 2261 cf::cede_to_tick;
2068 2262
2263 if (exists $self->{load_path}) {
2069 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block; 2265 $f->skip_block;
2071 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2072 or return; 2267 or return;
2073 2268
2074 $self->post_load_original 2269 $self->post_load_original
2075 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2076 2271
2077 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2078 utf8::encode $uniq; 2273 utf8::encode $uniq;
2079 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2081 $self->clear_unique_items; 2276 $self->clear_unique_items;
2082 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2084 } 2280 }
2085 } 2281 }
2086 }
2087 2282
2088 $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);
2089 2290
2090 cf::cede_to_tick; 2291 cf::cede_to_tick;
2091 # now do the right thing for maps 2292 # now do the right thing for maps
2092 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2093 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2097 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2098 $self->decay_objects; 2299 $self->decay_objects;
2099 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2100 $self->update_buttons; 2301 $self->update_buttons;
2101 cf::cede_to_tick; 2302 cf::cede_to_tick;
2102 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2103 } 2304 }
2104 2305
2105 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2106 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2107
2108 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2308 }
2110 2309
2111 $self->post_load; 2310 $self->post_load;
2311
2312 1
2112} 2313}
2113 2314
2114# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2124# if $self->per_party; 2325# if $self->per_party;
2125 2326
2126 $self 2327 $self
2127} 2328}
2128 2329
2129# find and load all maps in the 3x3 area around a map
2130sub load_neighbours {
2131 my ($map) = @_;
2132
2133 my @neigh; # diagonal neighbours
2134
2135 for (0 .. 3) {
2136 my $neigh = $map->tile_path ($_)
2137 or next;
2138 $neigh = find $neigh, $map
2139 or next;
2140 $neigh->load;
2141
2142 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 }
2146
2147 for (grep defined $_->[0], @neigh) {
2148 my ($path, $origin) = @$_;
2149 my $neigh = find $path, $origin
2150 or next;
2151 $neigh->load;
2152 }
2153}
2154
2155sub find_sync { 2330sub find_sync {
2156 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2157 2332
2158 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
2159} 2338}
2160 2339
2161sub do_load_sync { 2340sub do_load_sync {
2162 my ($map) = @_; 2341 my ($map) = @_;
2163 2342
2343 # it's a bug to call this from the main context
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2166 2346
2167 cf::sync_job { $map->load }; 2347 $map->load;
2168} 2348}
2169 2349
2170our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2172 2352
2173sub find_async { 2353sub find_async {
2174 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2175 2355
2176 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2177 2357
2178 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2180 } 2360 }
2181 2361
2182 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2183 2363
2184 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2198 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2199 2379
2200 () 2380 ()
2201} 2381}
2202 2382
2383# common code, used by both ->save and ->swapout
2203sub save { 2384sub _save {
2204 my ($self) = @_; 2385 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2386
2208 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2209 2388
2210 return unless $self->dirty; 2389 return unless $self->dirty;
2211 2390
… …
2231 } else { 2410 } else {
2232 $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);
2233 } 2412 }
2234} 2413}
2235 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2236sub swap_out { 2423sub swap_out {
2237 my ($self) = @_; 2424 my ($self) = @_;
2238 2425
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2244 return if $self->players; 2430 return if $self->players;
2245 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
2246 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2247 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
2248 $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};
2249 2482
2250 $self->deactivate; 2483 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2485 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2486
2298 $self->unlink_save; 2487 $self->unlink_save;
2299 $self->destroy; 2488 $self->destroy;
2300} 2489}
2301 2490
… …
2309 2498
2310 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2311 2500
2312 $self->unlink_save; 2501 $self->unlink_save;
2313 2502
2314 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2508
… …
2549 2738
2550Freezes 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}>).
2551 2740
2552The 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.
2553for 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,
2554though, 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
2555map. 2744map.
2556 2745
2557Will never block. 2746Will never block.
2558 2747
2559=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2581 my ($self) = @_; 2770 my ($self) = @_;
2582 2771
2583 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2584 2773
2774 ++$self->{_link_recursion};
2775
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2777
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2589 2780
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2782}
2592 2783
2593sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2595 2786
… …
2615 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2616 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2617 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2618 2809
2619 $map->load; 2810 $map->load;
2620 $map->load_neighbours;
2621 2811
2622 return unless $self->contr->active; 2812 return unless $self->contr->active;
2623 2813
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2626 2816 # entering was successful
2817 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2819 $self->activate_recursive;
2629} 2820 }
2630 2821
2822}
2823
2631=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)]])
2632 2825
2633Moves 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
2634her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2635that 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
2636the 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
… …
2643 2836
2644our $GOTOGEN; 2837our $GOTOGEN;
2645 2838
2646sub cf::object::player::goto { 2839sub cf::object::player::goto {
2647 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 }
2648 2847
2649 # 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
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2850
2652 $self->enter_link; 2851 $self->enter_link;
… …
2672 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2673 } 2872 }
2674 } 2873 }
2675 2874
2676 my $map = eval { 2875 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678 2877
2679 if ($map) { 2878 if ($map) {
2680 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2881 } else {
2683 $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);
2684 } 2883 }
2685 2884
2686 $map 2885 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2697 } 2896 }
2698 2897
2699 $done->() if $done; 2898 $done->($self) if $done;
2700 })->prio (1); 2899 })->prio (1);
2701} 2900}
2702 2901
2703=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2704 2903
… …
2772 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2773 2972
2774 unless (eval { 2973 unless (eval {
2775 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2776 2975
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2786 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2787 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 }
2788 3002
2789 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2790 3004
2791 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "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. "
2799 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2801 3015
2802 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 3017 $self->leave_link;
2804 } 3018 }
2805 })->prio (1); 3019 })->prio (1);
2806} 3020}
2807 3021
… …
3034=cut 3248=cut
3035 3249
3036sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3037 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3038 3252
3039 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3040 $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]));
3041 } elsif ($self->extcmd == 1) {
3042 #TODO: version 1, remove
3043 unshift @msg, msgtype => "reply", msgid => $id;
3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045 }
3046} 3256}
3047 3257
3048=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3049 3259
3050Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3105 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3106 3316
3107 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108 3318
3109 if (ref $msg) { 3319 if (ref $msg) {
3110 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111 "ARRAY" eq ref $msg
3112 ? @$msg
3113 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114 3321
3115 my @reply; 3322 my @reply;
3116 3323
3117 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3118 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3120 3327
3121 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3329 if $reply;
3123 3330
3124 } else { 3331 } else {
3125 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";
3126 } 3333 }
3127 3334
3128 cf::override; 3335 cf::override;
3129 }, 3336 },
3130); 3337);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3215) { 3422) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3425 for @funs;
3220} 3426}
3221 3427
… …
3260 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3468 }
3263 3469
3264 if ($@) { 3470 if ($@) {
3265 warn "$@"; 3471 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3268 } 3474 }
3269 3475
3270 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3271} 3477}
3272 3478
… …
3306 # for this (global event?) 3512 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3514
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3516
3311 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3312 3518
3313 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3520
3319 $facedata->{version} == 2 3521 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3523
3322 # patch in the exptable 3524 # patch in the exptable
… …
3336 3538
3337 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 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} ;
3341 3544
3342 cf::cede_to_tick; 3545 cf::cede_to_tick;
3343 } 3546 }
3344 3547
3345 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3350 3553
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3557 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3559 }
3357 3560
3358 cf::cede_to_tick; 3561 cf::cede_to_tick;
3359 } 3562 }
3360 } 3563 }
… …
3372 3575
3373 { 3576 {
3374 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3375 3578
3376 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3377 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
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3583
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 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
3382 } else { 3587 } else {
3383 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3384 } 3589 }
3385 3590
3386 cf::cede_to_tick; 3591 cf::cede_to_tick;
3387 } 3592 }
3388 } 3593 }
3389 3594
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3596
3392 1 3597 1
3393} 3598}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3599
3415register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3417 3602
3418 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3642sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3460} 3645}
3461 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
3462sub reload_resources { 3667sub reload_resources {
3463 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3464 3669
3670 reload_exp_table;
3671 reload_materials;
3465 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3466 reload_archetypes; 3674 reload_archetypes;
3467 reload_regions; 3675 reload_regions;
3468 reload_treasures; 3676 reload_treasures;
3469 3677
3470 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3471} 3679}
3472 3680
3473sub reload_config { 3681sub reload_config {
3474 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3475 3683
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3477 or return; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3478 3687
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3689
3484 $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};
3485 $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};
3486 3692
3487 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3697 };
3492 warn $@ if $@; 3698 warn $@ if $@;
3493 } 3699 }
3494
3495 warn "finished reloading resource files\n";
3496} 3700}
3497 3701
3498sub pidfile() { 3702sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3514 print $fh $$; 3718 print $fh $$;
3515} 3719}
3516 3720
3517sub main_loop { 3721sub main_loop {
3518 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3519 if (1) { 3723 if (1) {
3520 EV::loop; 3724 EV::loop;
3521 } 3725 }
3522 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3524} 3728}
3525 3729
3526sub main { 3730sub main {
3527 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3528 3732
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 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.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3737
3539 $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
3540 3739
3541 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
… …
3548 }; 3747 };
3549 3748
3550 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3551 3750
3552 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
3553 cf::load_settings; 3758 cf::load_settings;
3554 cf::load_materials;
3555 3759
3556 reload_resources; 3760 reload_resources;
3557 reload_config; 3761 reload_config;
3558 db_init; 3762 db_init;
3559 3763
… …
3571 3775
3572 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3777 use POSIX ();
3574 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};
3575 3779
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3577 }; 3781 };
3578 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
3579 main_loop; 3790 goto &main_loop;
3580} 3791}
3581 3792
3582############################################################################# 3793#############################################################################
3583# initialisation and cleanup 3794# initialisation and cleanup
3584 3795
… …
3623 or return; 3834 or return;
3624 3835
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3837 and return;
3627 3838
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3840
3630 1 3841 1
3631} 3842}
3632 3843
3633our $uuid_lock; 3844our $uuid_lock;
… …
3645 or return; 3856 or return;
3646 3857
3647 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3648 3859
3649 unless ($value) { 3860 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3862 return;
3652 } 3863 }
3653 3864
3654 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3665 or return; 3876 or return;
3666 3877
3667 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3668 and return; 3879 and return;
3669 3880
3670 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3671 3882
3672 1 3883 1
3673 3884
3674} 3885}
3675 3886
… …
3681} 3892}
3682 3893
3683sub emergency_save() { 3894sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3685 3896
3686 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;
3687 3903
3688 cf::sync_job { 3904 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3906
3694 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3913 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3915 $pl->save;
3703 } 3916 }
3704 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3705 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3706 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3924 $map->valid or next;
3710 $map->save; 3925 $map->save;
3711 } 3926 }
3712 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3713 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3717 3934
3718 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3936 write_uuid_sync 1;
3720 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
3721 }; 3957 };
3722 3958
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3729} 3960}
3730 3961
3731sub post_cleanup { 3962sub post_cleanup {
3732 my ($make_core) = @_; 3963 my ($make_core) = @_;
3733 3964
3965 IO::AIO::flush;
3966
3734 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3968 if $make_core;
3736 3969
3737 my $fh = pidfile; 3970 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3739} 3972}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3996 }
3764 warn "cleared package $pkg\n";#d#
3765} 3997}
3766 3998
3767sub do_reload_perl() { 3999sub do_reload_perl() {
3768 # can/must only be called in main 4000 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3770 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3771 return; 4003 return;
3772 } 4004 }
3773 4005
3774 return if $RELOAD++; 4006 return if $RELOAD++;
3775 4007
3776 my $t1 = AE::time; 4008 my $t1 = AE::time;
3777 4009
3778 while ($RELOAD) { 4010 while ($RELOAD) {
3779 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3780 4013
3781 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3782 4015
3783 cf::sync_job { 4016 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 4017 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 4018
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 4021 %EXT_CORO = ();
3801 4022
3802 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3803 %COMMAND = (); 4024 %COMMAND = ();
3804 4025
3805 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 4027 %EXTCMD = ();
3807 %EXTICMD = (); 4028 %EXTICMD = ();
3808 4029
3809 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3812 4033
3813 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3814 eval { 4035 eval {
3815 $cb->($pkg); 4036 $cb->($pkg);
3816 1 4037 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3818 } 4039 }
3819 4040
3820 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3821 clear_package $pkg; 4042 clear_package $pkg;
3822 } 4043 }
3823 4044
3824 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 4048
3828 warn "... unloading $k"; 4049 trace "... unloading $k";
3829 delete $INC{$k}; 4050 delete $INC{$k};
3830 4051
3831 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3833 4054
… …
3836 } 4057 }
3837 4058
3838 clear_package $k; 4059 clear_package $k;
3839 } 4060 }
3840 4061
3841 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 4063 clear_package "safe::$_"
3843 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);
3844 4065
3845 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 4069
3849 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4071 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3852 4073
3853 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3854 4075
3855 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3856 require cf; 4077 require cf;
3857 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3858 4079
3859 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4081 cf::reload_config;
3861 4082
3862 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4084 cf::load_extensions;
3864 4085
3865 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3872 } 4093 }
3873 4094
3874 warn "running post_init jobs"; 4095 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4096
3877 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3878 4098
3879 1 4099 1
3880 } or do { 4100 } or do {
3881 warn $@; 4101 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4103 };
3884 4104
3885 warn "reloaded";
3886 --$RELOAD; 4105 --$RELOAD;
3887 } 4106 }
3888 4107
3889 $t1 = AE::time - $t1; 4108 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3891}; 4110};
3892 4111
3893our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3894 4113
3895sub reload_perl() { 4114sub reload_perl() {
… …
3916 reload_perl; 4135 reload_perl;
3917 }; 4136 };
3918 } 4137 }
3919}; 4138};
3920 4139
3921unshift @INC, $LIBDIR; 4140#############################################################################
3922 4141
3923my $bug_warning = 0; 4142my $bug_warning = 0;
3924 4143
3925our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN;
3927
3928sub wait_for_tick { 4144sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930 4146
3931 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3932 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait;
3934} 4148}
3935 4149
3936sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938 4152
3939 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4155 $signal->wait;
3942} 4156}
… …
3946 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"
3947 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3948 return; 4162 return;
3949 } 4163 }
3950 4164
3951 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
3952 4166
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4168
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $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.;
3957 Coro::async_pool { 4171 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4173 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3961 }; 4175 };
3962 } 4176 }
3963 4177
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4179 $sig->send;
3966 } 4180 }
3967 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3968 $sig->send;
3969 }
3970 4182
3971 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973 4185
3974 if (0) { 4186 if (0) {
3975 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3979 } 4191 }
3980 } 4192 }
3981} 4193}
3982 4194
3983{ 4195{
3984 # configure BDB 4196 # configure BDB
3985 4197
3986 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
3987 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3988 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3989 4201
3990 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3991 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $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;
… …
4028 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4031} 4243}
4032 4244
4033my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4034 4247
4035sub _log_backtrace { 4248sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4037 4250
4038 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4039 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4259 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4044 async { 4261 async {
4045 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4046 4263
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4284 --$_log_backtrace;
4068 }; 4285 };
4069 } else { 4286 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4289 }
4073} 4290}
4074 4291
4075# load additional modules 4292# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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