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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 135
130our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
132our $NOW; 139our $NOW;
133 140
134our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
145 152
146our @POST_INIT; 153our @POST_INIT;
147 154
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
150 160
151binmode STDOUT; 161binmode STDOUT;
152binmode STDERR; 162binmode STDERR;
153 163
154# read virtual server time, if available 164# read virtual server time, if available
… …
165 175
166our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
167 177
168sub cf::map::normalise; 178sub cf::map::normalise;
169 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
170############################################################################# 184#############################################################################
171 185
172%REFLECT = (); 186%REFLECT = ();
173for (@REFLECT) { 187for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 188 my $reflect = JSON::XS::decode_json $_;
… …
184 198
185=over 4 199=over 4
186 200
187=item $cf::UPTIME 201=item $cf::UPTIME
188 202
189The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
190 219
191=item $cf::RUNTIME 220=item $cf::RUNTIME
192 221
193The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
194every server tick. 223every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
203database environment. 232database environment.
204 233
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 234=item $cf::LOADAVG
214 235
215The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
216(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
217objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 247from wherever your confdir points to.
227 248
228=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
229 250
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 252returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
233 271
234=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
235 273
236This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 283
246=back 284=back
247 285
248=cut 286=cut
249 287
288sub error(@) { LOG llevError, join "", @_ }
289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
250$Coro::State::WARNHOOK = sub { 294$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 295 my $msg = join "", @_;
252 296
253 $msg .= "\n" 297 $msg .= "\n"
254 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
255 299
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 301
258 LOG llevError, $msg; 302 LOG llevWarn, $msg;
259}; 303};
260 304
261$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
263 307
264 warn Carp::longmess $_[0]; 308 error Carp::longmess $_[0];
265 309
266 if ($Coro::current == $Coro::main) {#d# 310 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 312 return;#d#
269 }#d# 313 }#d#
270 314
271 # kill coroutine otherwise 315 # kill coroutine otherwise
272 Coro::terminate 316 Coro::terminate
… …
294} 338}
295 339
296$EV::DIED = sub { 340$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
298}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
299 348
300############################################################################# 349#############################################################################
301 350
302=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
303 352
… …
324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325 $d 374 $d
326 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
327} 376}
328 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
329=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
330 431
331Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
332 433
333=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 441
341sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
343 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
344=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
345 477
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
348 480
349The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 482is a reload or not.
351 483
352=cut 484=cut
353 485
354sub post_init(&) { 486sub post_init(&) {
355 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
356} 505}
357 506
358=item cf::lock_wait $string 507=item cf::lock_wait $string
359 508
360Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
399} 548}
400 549
401=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
402 551
403Like 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
404get spread over timer. 553get spread over time.
405 554
406=cut 555=cut
407 556
408sub periodic($$) { 557sub periodic($$) {
409 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
… …
413 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
414} 563}
415 564
416=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
417 566
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
421 574
422The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
424 577
425Useful for short background jobs. 578Useful for short background jobs.
… …
454 } 607 }
455 } 608 }
456 609
457 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
459 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 613 } else {
462 $busy = 0; 614 $busy = 0;
463 Coro::schedule; 615 Coro::schedule;
464 } 616 }
465 } 617 }
… …
505=cut 657=cut
506 658
507sub sync_job(&) { 659sub sync_job(&) {
508 my ($job) = @_; 660 my ($job) = @_;
509 661
510 if ($Coro::current == $Coro::main) { 662 if (in_main) {
511 my $time = AE::time; 663 my $time = AE::time;
512 664
513 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
515 667
516 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
517 669
518 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
519 671
520 my $busy = 1; 672 my $busy = 1;
521 my @res; 673 my @res;
522 674
523 (async { 675 (async {
524 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 677 @res = eval { $job->() };
526 warn $@ if $@; 678 error $@ if $@;
527 undef $busy; 679 undef $busy;
528 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
529 681
530 while ($busy) { 682 while ($busy) {
531 if (Coro::nready) { 683 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
566 718
567 $coro 719 $coro
568} 720}
569 721
570=item fork_call { }, $args 722=item fork_call { }, @args
571 723
572Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 727never block itself or use any form of event handling.
576 728
577=cut 729=cut
578 730
731sub post_fork {
732 reset_signals;
733}
734
579sub fork_call(&@) { 735sub fork_call(&@) {
580 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
581 737
582 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
585 741
586 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
587 reset_signals; 743 cf::post_fork;
588 &$cb 744 &$cb
589 }, @args; 745 } @args;
590 746
591 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
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 )
592} 759}
593 760
594=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
595 762
596=cut 763=cut
… …
633within each server. 800within each server.
634 801
635=cut 802=cut
636 803
637sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
638 my ($name) = @_; 808 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
640 810
641 eval { 811 eval {
642 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
… …
652} 822}
653 823
654our $DB; 824our $DB;
655 825
656sub db_init { 826sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
659 };
660} 828}
661 829
662sub db_get($$) { 830sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
664 832
665 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
666 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
667 837
668 $! ? () 838 $! ? ()
669 : $data 839 : $data
670 }
671} 840}
672 841
673sub db_put($$$) { 842sub db_put($$$) {
674 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
703 872
704 my @data; 873 my @data;
705 my $md5; 874 my $md5;
706 875
707 for (0 .. $#$src) { 876 for (0 .. $#$src) {
708 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
709 or Carp::croak "$src->[$_]: $!";
710 } 878 }
711 879
712 # if processing is expensive, check 880 # if processing is expensive, check
713 # checksum first 881 # checksum first
714 if (1) { 882 if (1) {
… …
731 899
732 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
733 my $data = $process->(\@data); 901 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
735 903
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 905
738 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
741 909
… …
751 919
752=cut 920=cut
753 921
754sub datalog($@) { 922sub datalog($@) {
755 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 925}
758 926
759=back 927=back
760 928
761=cut 929=cut
… …
956 1124
957 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1127
960 } elsif (ref $type) { 1128 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
962 1130
963 } else { 1131 } else {
964 shift @arg; 1132 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
966 } 1134 }
967 } 1135 }
968} 1136}
969 1137
970sub _object_attach { 1138sub _object_attach {
… …
980 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
981 } 1149 }
982 1150
983 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
984 } else { 1152 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1154 }
987 1155
988 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
989} 1157}
990 1158
… …
1049 1217
1050 for (@$callbacks) { 1218 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1052 1220
1053 if ($@) { 1221 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1223 override;
1057 } 1224 }
1058 1225
1059 return 1 if $override; 1226 return 1 if $override;
1060 } 1227 }
… …
1139 for (@$attach) { 1306 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1142 } 1309 }
1143 } else { 1310 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1312 }
1146 } 1313 }
1147} 1314}
1148 1315
1149cf::attachable->attach ( 1316cf::attachable->attach (
… …
1176 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1177 1344
1178 sync_job { 1345 sync_job {
1179 if (length $$rdata) { 1346 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1183 1351
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1355 if ($cf::USE_FSYNC) {
… …
1209 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1210 1378
1211 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1381 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1215 } 1383 }
1216 } else { 1384 } else {
1217 aio_unlink $filename; 1385 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1219 } 1387 }
… …
1243 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1412 $av = $st->{objs};
1245 } 1413 }
1246 1414
1247 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1250 1419
1251 ($data, $av) 1420 ($data, $av)
1252} 1421}
1253 1422
1254=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
… …
1331 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1332 1501
1333 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1334 1503
1335 if (ref $msg) { 1504 if (ref $msg) {
1336 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1337 "ARRAY" eq ref $msg
1338 ? @$msg
1339 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1340 1506
1341 my @reply; 1507 my @reply;
1342 1508
1343 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1344 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1346 1512
1347 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1348 if $reply; 1514 if $reply;
1349 1515
1350 } else { 1516 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1518 }
1353 1519
1354 cf::override; 1520 cf::override;
1355 }, 1521 },
1356); 1522);
… …
1366 }; 1532 };
1367 1533
1368 $grp 1534 $grp
1369} 1535}
1370 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
1371sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1372 cf::sync_job { 1553 cf::sync_job {
1373 my %todo; 1554 my %todo;
1374 1555
1375 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1557 next unless -r $path;
… …
1394 1575
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1578
1398 $ext{source} = 1579 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1401 . $source 1582 . $source
1402 . "\n};\n1"; 1583 . "\n};\n1";
1403 1584
1404 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1416 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1598 next ext
1418 unless exists $done{$_}; 1599 unless exists $done{$_};
1419 } 1600 }
1420 1601
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 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
1423 my $active = eval $v->{source}; 1613 my $active = eval $source;
1424 1614
1425 if (length $@) { 1615 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1427 1617
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 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};
1430 } else { 1623 } else {
1431 $done{$k} = delete $todo{$k}; 1624 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1625 push @EXTS, $v->{pkg};
1433 $progress = 1; 1626 $progress = 1;
1434 1627
1435 warn "$v->{base}: extension inactive.\n" 1628 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1629 unless $active;
1437 } 1630 }
1438 } 1631 }
1439 1632
1440 unless ($progress) { 1633 unless ($progress) {
… …
1442 1635
1443 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1446 } 1639 }
1640
1641 last;
1447 } 1642 }
1448 } 1643 }
1449 }; 1644 };
1450} 1645}
1451 1646
… …
1609 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1610 1805
1611 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1612 $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
1613 1808
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1810 $pl->deactivate;
1811
1616 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;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1619 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1620 1817
1621 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1677 \@logins 1874 \@logins
1678} 1875}
1679 1876
1680=item $player->maps 1877=item $player->maps
1681 1878
1879=item cf::player::maps $login
1880
1682Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1683player. May block. 1882player. May block.
1684 1883
1685=cut 1884=cut
1686 1885
… …
1748=cut 1947=cut
1749 1948
1750sub find_by_path($) { 1949sub find_by_path($) {
1751 my ($path) = @_; 1950 my ($path) = @_;
1752 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1753 my ($match, $specificity); 1954 my ($match, $specificity);
1754 1955
1755 for my $region (list) { 1956 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1757 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
… …
1785sub generate_random_map { 1986sub generate_random_map {
1786 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1787 1988
1788 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
1789 1990
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 1992}
1805 1993
1806=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1807 1995
1808Register 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
… …
1813 2001
1814sub register { 2002sub register {
1815 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 2004 my $pkg = caller;
1817 2005
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 2007
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 2009}
1823 2010
1824# also paths starting with '/' 2011# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 2013
1827sub thawer_merge { 2014sub thawer_merge {
1828 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1829 2016
1830 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
… …
1835} 2022}
1836 2023
1837sub normalise { 2024sub normalise {
1838 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1839 2026
1840 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1841 2028
1842 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1843 2030
1844 # map plan: 2031 # map plan:
1845 # 2032 #
… …
1860 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 2048 $path = "$base/$path";
1862 } 2049 }
1863 2050
1864 for ($path) { 2051 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1868 } 2054 }
1869 2055
1870 $path 2056 $path
… …
1884 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1885 return $self; 2071 return $self;
1886 } 2072 }
1887 } 2073 }
1888 2074
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 2076 ()
1891} 2077}
1892 2078
2079# may re-bless or do other evil things
1893sub init { 2080sub init {
1894 my ($self) = @_; 2081 my ($self) = @_;
1895 2082
1896 $self 2083 $self
1897} 2084}
… …
1962 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1963 2150
1964 1 2151 1
1965} 2152}
1966 2153
2154# used to laod the header of an original map
1967sub load_header_orig { 2155sub load_header_orig {
1968 my ($self) = @_; 2156 my ($self) = @_;
1969 2157
1970 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1971} 2159}
1972 2160
2161# used to laod the header of an instantiated map
1973sub load_header_temp { 2162sub load_header_temp {
1974 my ($self) = @_; 2163 my ($self) = @_;
1975 2164
1976 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1977} 2166}
1978 2167
2168# called after loading the header from an instantiated map
1979sub prepare_temp { 2169sub prepare_temp {
1980 my ($self) = @_; 2170 my ($self) = @_;
1981 2171
1982 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1983 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1984 # safety 2174 # safety
1985 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1986 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1987} 2177}
1988 2178
2179# called after loading the header from an original map
1989sub prepare_orig { 2180sub prepare_orig {
1990 my ($self) = @_; 2181 my ($self) = @_;
1991 2182
1992 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1993 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2017 2208
2018sub find; 2209sub find;
2019sub find { 2210sub find {
2020 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2021 2212
2213 cf::cede_to_tick;
2214
2022 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2023 2216
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2026 2219
2027 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2058 2251
2059 { 2252 {
2060 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2061 2254
2062 return unless $self->valid; 2255 return unless $self->valid;
2063 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2064
2065 $self->in_memory (cf::MAP_LOADING);
2066 2257
2067 $self->alloc; 2258 $self->alloc;
2068 2259
2069 $self->pre_load; 2260 $self->pre_load;
2070 cf::cede_to_tick; 2261 cf::cede_to_tick;
2071 2262
2263 if (exists $self->{load_path}) {
2072 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block; 2265 $f->skip_block;
2074 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2075 or return; 2267 or return;
2076 2268
2077 $self->post_load_original 2269 $self->post_load_original
2078 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2079 2271
2080 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2081 utf8::encode $uniq; 2273 utf8::encode $uniq;
2082 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2084 $self->clear_unique_items; 2276 $self->clear_unique_items;
2085 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2087 } 2280 }
2088 } 2281 }
2089 }
2090 2282
2091 $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);
2092 2290
2093 cf::cede_to_tick; 2291 cf::cede_to_tick;
2094 # now do the right thing for maps 2292 # now do the right thing for maps
2095 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2096 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2100 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2101 $self->decay_objects; 2299 $self->decay_objects;
2102 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2103 $self->update_buttons; 2301 $self->update_buttons;
2104 cf::cede_to_tick; 2302 cf::cede_to_tick;
2105 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2106 } 2304 }
2107 2305
2108 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2109 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2110
2111 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2308 }
2113 2309
2114 $self->post_load; 2310 $self->post_load;
2311
2312 1
2115} 2313}
2116 2314
2117# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2127# if $self->per_party; 2325# if $self->per_party;
2128 2326
2129 $self 2327 $self
2130} 2328}
2131 2329
2132# find and load all maps in the 3x3 area around a map
2133sub load_neighbours {
2134 my ($map) = @_;
2135
2136 my @neigh; # diagonal neighbours
2137
2138 for (0 .. 3) {
2139 my $neigh = $map->tile_path ($_)
2140 or next;
2141 $neigh = find $neigh, $map
2142 or next;
2143 $neigh->load;
2144
2145 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 }
2149
2150 for (grep defined $_->[0], @neigh) {
2151 my ($path, $origin) = @$_;
2152 my $neigh = find $path, $origin
2153 or next;
2154 $neigh->load;
2155 }
2156}
2157
2158sub find_sync { 2330sub find_sync {
2159 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2160 2332
2161 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
2162} 2338}
2163 2339
2164sub do_load_sync { 2340sub do_load_sync {
2165 my ($map) = @_; 2341 my ($map) = @_;
2166 2342
2343 # it's a bug to call this from the main context
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2169 2346
2170 cf::sync_job { $map->load }; 2347 $map->load;
2171} 2348}
2172 2349
2173our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2175 2352
2176sub find_async { 2353sub find_async {
2177 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2178 2355
2179 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2180 2357
2181 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2183 } 2360 }
2184 2361
2185 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2186 2363
2187 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2201 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2202 2379
2203 () 2380 ()
2204} 2381}
2205 2382
2383# common code, used by both ->save and ->swapout
2206sub save { 2384sub _save {
2207 my ($self) = @_; 2385 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2386
2211 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2212 2388
2213 return unless $self->dirty; 2389 return unless $self->dirty;
2214 2390
… …
2234 } else { 2410 } else {
2235 $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);
2236 } 2412 }
2237} 2413}
2238 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2239sub swap_out { 2423sub swap_out {
2240 my ($self) = @_; 2424 my ($self) = @_;
2241 2425
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2247 return if $self->players; 2430 return if $self->players;
2248 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
2249 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2250 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
2251 $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};
2252 2482
2253 $self->deactivate; 2483 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2485 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2486
2301 $self->unlink_save; 2487 $self->unlink_save;
2302 $self->destroy; 2488 $self->destroy;
2303} 2489}
2304 2490
… …
2312 2498
2313 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2314 2500
2315 $self->unlink_save; 2501 $self->unlink_save;
2316 2502
2317 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2508
… …
2552 2738
2553Freezes 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}>).
2554 2740
2555The 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.
2556for 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,
2557though, 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
2558map. 2744map.
2559 2745
2560Will never block. 2746Will never block.
2561 2747
2562=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
… …
2583sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2584 my ($self) = @_; 2770 my ($self) = @_;
2585 2771
2586 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2587 2773
2774 ++$self->{_link_recursion};
2775
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2777
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2592 2780
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2782}
2595 2783
2596sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2598 2786
… …
2618 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2619 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2620 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2621 2809
2622 $map->load; 2810 $map->load;
2623 $map->load_neighbours;
2624 2811
2625 return unless $self->contr->active; 2812 return unless $self->contr->active;
2626 2813
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2629 2816 # entering was successful
2817 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2819 $self->activate_recursive;
2632} 2820 }
2633 2821
2822}
2823
2634=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)]])
2635 2825
2636Moves 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
2637her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2638that 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
2639the 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
… …
2646 2836
2647our $GOTOGEN; 2837our $GOTOGEN;
2648 2838
2649sub cf::object::player::goto { 2839sub cf::object::player::goto {
2650 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 }
2651 2847
2652 # 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
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2850
2655 $self->enter_link; 2851 $self->enter_link;
… …
2675 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2676 } 2872 }
2677 } 2873 }
2678 2874
2679 my $map = eval { 2875 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681 2877
2682 if ($map) { 2878 if ($map) {
2683 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2881 } else {
2686 $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);
2687 } 2883 }
2688 2884
2689 $map 2885 $map
… …
2697 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2700 } 2896 }
2701 2897
2702 $done->() if $done; 2898 $done->($self) if $done;
2703 })->prio (1); 2899 })->prio (1);
2704} 2900}
2705 2901
2706=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2707 2903
… …
2775 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2776 2972
2777 unless (eval { 2973 unless (eval {
2778 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2779 2975
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2789 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2790 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 }
2791 3002
2792 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2793 3004
2794 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
2800 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "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. "
2802 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2804 3015
2805 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 3017 $self->leave_link;
2807 } 3018 }
2808 })->prio (1); 3019 })->prio (1);
2809} 3020}
2810 3021
… …
3037=cut 3248=cut
3038 3249
3039sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3040 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3041 3252
3042 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3043 $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]));
3044 } elsif ($self->extcmd == 1) {
3045 #TODO: version 1, remove
3046 unshift @msg, msgtype => "reply", msgid => $id;
3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3048 }
3049} 3256}
3050 3257
3051=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3052 3259
3053Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3108 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3109 3316
3110 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3111 3318
3112 if (ref $msg) { 3319 if (ref $msg) {
3113 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3114 "ARRAY" eq ref $msg
3115 ? @$msg
3116 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3117 3321
3118 my @reply; 3322 my @reply;
3119 3323
3120 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3121 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3123 3327
3124 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3329 if $reply;
3126 3330
3127 } else { 3331 } else {
3128 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";
3129 } 3333 }
3130 3334
3131 cf::override; 3335 cf::override;
3132 }, 3336 },
3133); 3337);
… …
3214 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3218) { 3422) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3425 for @funs;
3223} 3426}
3224 3427
… …
3263 local @cf::_safe_eval_args = values %vars; 3466 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3467 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3468 }
3266 3469
3267 if ($@) { 3470 if ($@) {
3268 warn "$@"; 3471 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3271 } 3474 }
3272 3475
3273 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3274} 3477}
3275 3478
… …
3309 # for this (global event?) 3512 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3514
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3516
3314 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3315 3518
3316 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3317 0 < aio_load $path, $facedata
3318 or die "$path: $!";
3319
3320 $facedata = Coro::Storable::thaw $facedata;
3321 3520
3322 $facedata->{version} == 2 3521 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3324 3523
3325 # patch in the exptable 3524 # patch in the exptable
… …
3339 3538
3340 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 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} ;
3344 3544
3345 cf::cede_to_tick; 3545 cf::cede_to_tick;
3346 } 3546 }
3347 3547
3348 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
… …
3353 3553
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3557 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3559 }
3360 3560
3361 cf::cede_to_tick; 3561 cf::cede_to_tick;
3362 } 3562 }
3363 } 3563 }
… …
3375 3575
3376 { 3576 {
3377 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3378 3578
3379 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3380 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
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3583
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 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
3385 } else { 3587 } else {
3386 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3387 } 3589 }
3388 3590
3389 cf::cede_to_tick; 3591 cf::cede_to_tick;
3390 } 3592 }
3391 } 3593 }
3392 3594
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3596
3395 1 3597 1
3396} 3598}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3599
3418register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3420 3602
3421 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
… …
3460sub reload_treasures { 3642sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3463} 3645}
3464 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
3465sub reload_resources { 3667sub reload_resources {
3466 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3467 3669
3670 reload_exp_table;
3671 reload_materials;
3468 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3469 reload_archetypes; 3674 reload_archetypes;
3470 reload_regions; 3675 reload_regions;
3471 reload_treasures; 3676 reload_treasures;
3472 3677
3473 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3474} 3679}
3475 3680
3476sub reload_config { 3681sub reload_config {
3477 warn "reloading config file...\n"; 3682 trace "reloading config file...\n";
3478 3683
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3684 my $config = load_file "$CONFDIR/config";
3480 or return; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3481 3687
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3689
3487 $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};
3488 $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};
3489 3692
3490 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
… …
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3695 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3696 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3697 };
3495 warn $@ if $@; 3698 warn $@ if $@;
3496 } 3699 }
3497
3498 warn "finished reloading resource files\n";
3499} 3700}
3500 3701
3501sub pidfile() { 3702sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3704 or die "$PIDFILE: $!";
… …
3516 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3517 print $fh $$; 3718 print $fh $$;
3518} 3719}
3519 3720
3520sub main_loop { 3721sub main_loop {
3521 warn "EV::loop starting\n"; 3722 trace "EV::loop starting\n";
3522 if (1) { 3723 if (1) {
3523 EV::loop; 3724 EV::loop;
3524 } 3725 }
3525 warn "EV::loop returned\n"; 3726 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3727 goto &main_loop unless $REALLY_UNLOOP;
3527} 3728}
3528 3729
3529sub main { 3730sub main {
3530 cf::init_globals; # initialise logging 3731 cf::init_globals; # initialise logging
3531 3732
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 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.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541 3737
3542 $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
3543 3739
3544 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
… …
3551 }; 3747 };
3552 3748
3553 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3554 3750
3555 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
3556 cf::load_settings; 3758 cf::load_settings;
3557 cf::load_materials;
3558 3759
3559 reload_resources; 3760 reload_resources;
3560 reload_config; 3761 reload_config;
3561 db_init; 3762 db_init;
3562 3763
… …
3574 3775
3575 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3777 use POSIX ();
3577 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};
3578 3779
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3780 cf::_post_init 0;
3580 }; 3781 };
3581 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
3582 main_loop; 3790 goto &main_loop;
3583} 3791}
3584 3792
3585############################################################################# 3793#############################################################################
3586# initialisation and cleanup 3794# initialisation and cleanup
3587 3795
… …
3626 or return; 3834 or return;
3627 3835
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3837 and return;
3630 3838
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3840
3633 1 3841 1
3634} 3842}
3635 3843
3636our $uuid_lock; 3844our $uuid_lock;
… …
3648 or return; 3856 or return;
3649 3857
3650 my $value = uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3651 3859
3652 unless ($value) { 3860 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3861 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3862 return;
3655 } 3863 }
3656 3864
3657 my $value = uuid_str $value + $uuid_skip; 3865 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3866 $uuid_skip = 0;
… …
3668 or return; 3876 or return;
3669 3877
3670 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3671 and return; 3879 and return;
3672 3880
3673 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3674 3882
3675 1 3883 1
3676 3884
3677} 3885}
3678 3886
… …
3684} 3892}
3685 3893
3686sub emergency_save() { 3894sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3688 3896
3689 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;
3690 3903
3691 cf::sync_job { 3904 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3905 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 3906
3697 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3913 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3915 $pl->save;
3706 } 3916 }
3707 warn "emergency_perl_save: end player save\n"; 3917 info "emergency_perl_save: end player save\n";
3708 3918
3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3709 warn "emergency_perl_save: begin map save\n"; 3921 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3924 $map->valid or next;
3713 $map->save; 3925 $map->save;
3714 } 3926 }
3715 warn "emergency_perl_save: end map save\n"; 3927 info "emergency_perl_save: end map save\n";
3716 3928
3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3931 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3720 3934
3721 warn "emergency_perl_save: begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3936 write_uuid_sync 1;
3723 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
3724 }; 3957 };
3725 3958
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 3959 info "emergency_perl_save: leave\n";
3732} 3960}
3733 3961
3734sub post_cleanup { 3962sub post_cleanup {
3735 my ($make_core) = @_; 3963 my ($make_core) = @_;
3736 3964
3965 IO::AIO::flush;
3966
3737 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3968 if $make_core;
3739 3969
3740 my $fh = pidfile; 3970 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3742} 3972}
… …
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 3996 }
3767 warn "cleared package $pkg\n";#d#
3768} 3997}
3769 3998
3770sub do_reload_perl() { 3999sub do_reload_perl() {
3771 # can/must only be called in main 4000 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3773 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3774 return; 4003 return;
3775 } 4004 }
3776 4005
3777 return if $RELOAD++; 4006 return if $RELOAD++;
3778 4007
3779 my $t1 = AE::time; 4008 my $t1 = AE::time;
3780 4009
3781 while ($RELOAD) { 4010 while ($RELOAD) {
3782 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3783 4013
3784 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3785 4015
3786 cf::sync_job { 4016 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 4017 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 4018
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 4021 %EXT_CORO = ();
3804 4022
3805 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3806 %COMMAND = (); 4024 %COMMAND = ();
3807 4025
3808 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 4027 %EXTCMD = ();
3810 %EXTICMD = (); 4028 %EXTICMD = ();
3811 4029
3812 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3815 4033
3816 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3817 eval { 4035 eval {
3818 $cb->($pkg); 4036 $cb->($pkg);
3819 1 4037 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3821 } 4039 }
3822 4040
3823 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3824 clear_package $pkg; 4042 clear_package $pkg;
3825 } 4043 }
3826 4044
3827 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 4048
3831 warn "... unloading $k"; 4049 trace "... unloading $k";
3832 delete $INC{$k}; 4050 delete $INC{$k};
3833 4051
3834 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3836 4054
… …
3839 } 4057 }
3840 4058
3841 clear_package $k; 4059 clear_package $k;
3842 } 4060 }
3843 4061
3844 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 4063 clear_package "safe::$_"
3846 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);
3847 4065
3848 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 4069
3852 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3853 # and global variables created in xs 4071 # and global variables created in xs
3854 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3855 4073
3856 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3857 4075
3858 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3859 require cf; 4077 require cf;
3860 cf::_connect_to_perl_1; 4078 cf::_connect_to_perl_1;
3861 4079
3862 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4081 cf::reload_config;
3864 4082
3865 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4084 cf::load_extensions;
3867 4085
3868 if ($REATTACH_ON_RELOAD) { 4086 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
3875 } 4093 }
3876 4094
3877 warn "running post_init jobs"; 4095 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4096
3880 warn "leaving sync_job"; 4097 trace "perl_reload: leaving sync_job";
3881 4098
3882 1 4099 1
3883 } or do { 4100 } or do {
3884 warn $@; 4101 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4103 };
3887 4104
3888 warn "reloaded";
3889 --$RELOAD; 4105 --$RELOAD;
3890 } 4106 }
3891 4107
3892 $t1 = AE::time - $t1; 4108 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4109 info "perl_reload: completed in ${t1}s\n";
3894}; 4110};
3895 4111
3896our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3897 4113
3898sub reload_perl() { 4114sub reload_perl() {
… …
3919 reload_perl; 4135 reload_perl;
3920 }; 4136 };
3921 } 4137 }
3922}; 4138};
3923 4139
3924unshift @INC, $LIBDIR; 4140#############################################################################
3925 4141
3926my $bug_warning = 0; 4142my $bug_warning = 0;
3927 4143
3928our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN;
3930
3931sub wait_for_tick { 4144sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3933 4146
3934 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3935 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait;
3937} 4148}
3938 4149
3939sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3941 4152
3942 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4155 $signal->wait;
3945} 4156}
… …
3949 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"
3950 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3951 return; 4162 return;
3952 } 4163 }
3953 4164
3954 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
3955 4166
3956 #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#
3957 4168
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $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.;
3960 Coro::async_pool { 4171 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4173 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3964 }; 4175 };
3965 } 4176 }
3966 4177
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4179 $sig->send;
3969 } 4180 }
3970 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3971 $sig->send;
3972 }
3973 4182
3974 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3976 4185
3977 if (0) { 4186 if (0) {
3978 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3982 } 4191 }
3983 } 4192 }
3984} 4193}
3985 4194
3986{ 4195{
3987 # configure BDB 4196 # configure BDB
3988 4197
3989 BDB::min_parallel 16; 4198 BDB::min_parallel 16;
3990 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3991 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3992 4201
3993 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3994 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996 $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;
… …
4031 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
4034} 4243}
4035 4244
4036my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
4037 4247
4038sub _log_backtrace { 4248sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
4040 4250
4041 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
4042 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4259 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
4047 async { 4261 async {
4048 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
4049 4263
… …
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4284 --$_log_backtrace;
4071 }; 4285 };
4072 } else { 4286 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4289 }
4076} 4290}
4077 4291
4078# load additional modules 4292# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4293require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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