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.524 by root, Sun Apr 18 07:08:07 2010 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 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;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 4000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
115 124
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 127our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 133our $DB_ENV;
125 134
126our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 136
128our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 139
130our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
132our $NOW; 143our $NOW;
133 144
134our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
145 156
146our @POST_INIT; 157our @POST_INIT;
147 158
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
150 164
151binmode STDOUT; 165binmode STDOUT;
152binmode STDERR; 166binmode STDERR;
153 167
154# read virtual server time, if available 168# read virtual server time, if available
… …
188 202
189=over 4 203=over 4
190 204
191=item $cf::UPTIME 205=item $cf::UPTIME
192 206
193The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
194 223
195=item $cf::RUNTIME 224=item $cf::RUNTIME
196 225
197The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
198every server tick. 227every server tick.
… …
204Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
207database environment. 236database environment.
208 237
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 238=item $cf::LOADAVG
218 239
219The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
220(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
221objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
230from wherever your confdir points to. 251from wherever your confdir points to.
231 252
232=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
233 254
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
237 275
238=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
239 277
240This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
249 287
250=back 288=back
251 289
252=cut 290=cut
253 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
254$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 299 my $msg = join "", @_;
256 300
257 $msg .= "\n" 301 $msg .= "\n"
258 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
259 303
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 305
262 LOG llevError, $msg; 306 LOG llevWarn, $msg;
263}; 307};
264 308
265$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
267 311
268 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
269 313
270 if (in_main) {#d# 314 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 316 return;#d#
273 }#d# 317 }#d#
274 318
275 # kill coroutine otherwise 319 # kill coroutine otherwise
276 Coro::terminate 320 Coro::terminate
… …
296)) { 340)) {
297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298} 342}
299 343
300$EV::DIED = sub { 344$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
302}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
303 352
304############################################################################# 353#############################################################################
305 354
306=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
307 356
… …
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 378 $d
330 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
331} 380}
332 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
333=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
334 435
335Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
336 437
337=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 445
345sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
347 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
348=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
349 481
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
352 484
353The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 486is a reload or not.
355 487
356=cut 488=cut
357 489
358sub post_init(&) { 490sub post_init(&) {
359 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
360} 509}
361 510
362=item cf::lock_wait $string 511=item cf::lock_wait $string
363 512
364Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
418} 567}
419 568
420=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
421 570
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
425 578
426The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
428 581
429Useful for short background jobs. 582Useful for short background jobs.
… …
458 } 611 }
459 } 612 }
460 613
461 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
462 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
463 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 617 } else {
466 $busy = 0; 618 $busy = 0;
467 Coro::schedule; 619 Coro::schedule;
468 } 620 }
469 } 621 }
… …
509=cut 661=cut
510 662
511sub sync_job(&) { 663sub sync_job(&) {
512 my ($job) = @_; 664 my ($job) = @_;
513 665
514 if ($Coro::current == $Coro::main) { 666 if (in_main) {
515 my $time = AE::time; 667 my $time = AE::time;
516 668
517 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
519 671
520 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
521 673
522 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
523 675
524 my $busy = 1; 676 my $busy = 1;
525 my @res; 677 my @res;
526 678
527 (async { 679 (async {
528 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 681 @res = eval { $job->() };
530 warn $@ if $@; 682 error $@ if $@;
531 undef $busy; 683 undef $busy;
532 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
533 685
534 while ($busy) { 686 while ($busy) {
535 if (Coro::nready) { 687 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
570 722
571 $coro 723 $coro
572} 724}
573 725
574=item fork_call { }, $args 726=item fork_call { }, @args
575 727
576Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 731never block itself or use any form of event handling.
580 732
581=cut 733=cut
582 734
735sub post_fork {
736 reset_signals;
737}
738
583sub fork_call(&@) { 739sub fork_call(&@) {
584 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
585 741
586 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
589 745
590 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
591 reset_signals; 747 cf::post_fork;
592 &$cb 748 &$cb
593 }, @args; 749 } @args;
594 750
595 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
596} 752}
597 753
598sub objinfo { 754sub objinfo {
… …
648within each server. 804within each server.
649 805
650=cut 806=cut
651 807
652sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
653 my ($name) = @_; 812 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
655 814
656 eval { 815 eval {
657 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
667} 826}
668 827
669our $DB; 828our $DB;
670 829
671sub db_init { 830sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
674 };
675} 832}
676 833
677sub db_get($$) { 834sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
679 836
680 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
681 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
682 841
683 $! ? () 842 $! ? ()
684 : $data 843 : $data
685 }
686} 844}
687 845
688sub db_put($$$) { 846sub db_put($$$) {
689 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 876
719 my @data; 877 my @data;
720 my $md5; 878 my $md5;
721 879
722 for (0 .. $#$src) { 880 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 882 }
726 883
727 # if processing is expensive, check 884 # if processing is expensive, check
728 # checksum first 885 # checksum first
729 if (1) { 886 if (1) {
… …
746 903
747 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 905 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
750 907
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 909
753 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
756 913
… …
766 923
767=cut 924=cut
768 925
769sub datalog($@) { 926sub datalog($@) {
770 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 929}
773 930
774=back 931=back
775 932
776=cut 933=cut
… …
971 1128
972 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1131
975 } elsif (ref $type) { 1132 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
977 1134
978 } else { 1135 } else {
979 shift @arg; 1136 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
981 } 1138 }
982 } 1139 }
983} 1140}
984 1141
985sub _object_attach { 1142sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
996 } 1153 }
997 1154
998 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
999 } else { 1156 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1158 }
1002 1159
1003 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1004} 1161}
1005 1162
… …
1064 1221
1065 for (@$callbacks) { 1222 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1067 1224
1068 if ($@) { 1225 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1227 override;
1072 } 1228 }
1073 1229
1074 return 1 if $override; 1230 return 1 if $override;
1075 } 1231 }
… …
1154 for (@$attach) { 1310 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1157 } 1313 }
1158 } else { 1314 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1316 }
1161 } 1317 }
1162} 1318}
1163 1319
1164cf::attachable->attach ( 1320cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1192 1348
1193 sync_job { 1349 sync_job {
1194 if (length $$rdata) { 1350 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1198 1355
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1225 1382
1226 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1385 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1230 } 1387 }
1231 } else { 1388 } else {
1232 aio_unlink $filename; 1389 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1234 } 1391 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1416 $av = $st->{objs};
1260 } 1417 }
1261 1418
1262 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1265 1423
1266 ($data, $av) 1424 ($data, $av)
1267} 1425}
1268 1426
1269=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1346 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1347 1505
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1507
1350 if (ref $msg) { 1508 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1510
1356 my @reply; 1511 my @reply;
1357 1512
1358 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1361 1516
1362 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1518 if $reply;
1364 1519
1365 } else { 1520 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1522 }
1368 1523
1369 cf::override; 1524 cf::override;
1370 }, 1525 },
1371); 1526);
… …
1381 }; 1536 };
1382 1537
1383 $grp 1538 $grp
1384} 1539}
1385 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1386sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1387 cf::sync_job { 1557 cf::sync_job {
1388 my %todo; 1558 my %todo;
1389 1559
1390 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1561 next unless -r $path;
… …
1409 1579
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1582
1413 $ext{source} = 1583 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1416 . $source 1586 . $source
1417 . "\n};\n1"; 1587 . "\n};\n1";
1418 1588
1419 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1602 next ext
1433 unless exists $done{$_}; 1603 unless exists $done{$_};
1434 } 1604 }
1435 1605
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1438 my $active = eval $v->{source}; 1617 my $active = eval $source;
1439 1618
1440 if (length $@) { 1619 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1442 1621
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1445 1624
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1627 } else {
1449 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1451 $progress = 1; 1630 $progress = 1;
1452 1631
1453 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1633 unless $active;
1455 } 1634 }
1456 } 1635 }
1457 1636
1458 unless ($progress) { 1637 unless ($progress) {
… …
1460 1639
1461 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1464 } 1643 }
1644
1645 last;
1465 } 1646 }
1466 } 1647 }
1467 }; 1648 };
1468} 1649}
1469 1650
… …
1627 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1628 1809
1629 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1812
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1814 $pl->deactivate;
1815
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1637 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1638 1821
1639 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1990sub generate_random_map {
1808 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1809 1992
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1994
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1996}
1827 1997
1828=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1829 1999
1830Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1835 2005
1836sub register { 2006sub register {
1837 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 2008 my $pkg = caller;
1839 2009
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 2011
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 2013}
1845 2014
… …
1857} 2026}
1858 2027
1859sub normalise { 2028sub normalise {
1860 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1861 2030
1862 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1863 2032
1864 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1865 2034
1866 # map plan: 2035 # map plan:
1867 # 2036 #
… …
1882 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 2052 $path = "$base/$path";
1884 } 2053 }
1885 2054
1886 for ($path) { 2055 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1890 } 2058 }
1891 2059
1892 $path 2060 $path
… …
1906 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1907 return $self; 2075 return $self;
1908 } 2076 }
1909 } 2077 }
1910 2078
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2080 ()
1913} 2081}
1914 2082
2083# may re-bless or do other evil things
1915sub init { 2084sub init {
1916 my ($self) = @_; 2085 my ($self) = @_;
1917 2086
1918 $self 2087 $self
1919} 2088}
… …
1984 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1985 2154
1986 1 2155 1
1987} 2156}
1988 2157
2158# used to laod the header of an original map
1989sub load_header_orig { 2159sub load_header_orig {
1990 my ($self) = @_; 2160 my ($self) = @_;
1991 2161
1992 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1993} 2163}
1994 2164
2165# used to laod the header of an instantiated map
1995sub load_header_temp { 2166sub load_header_temp {
1996 my ($self) = @_; 2167 my ($self) = @_;
1997 2168
1998 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1999} 2170}
2000 2171
2172# called after loading the header from an instantiated map
2001sub prepare_temp { 2173sub prepare_temp {
2002 my ($self) = @_; 2174 my ($self) = @_;
2003 2175
2004 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2006 # safety 2178 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2181}
2010 2182
2183# called after loading the header from an original map
2011sub prepare_orig { 2184sub prepare_orig {
2012 my ($self) = @_; 2185 my ($self) = @_;
2013 2186
2014 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2039 2212
2040sub find; 2213sub find;
2041sub find { 2214sub find {
2042 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2043 2216
2217 cf::cede_to_tick;
2218
2044 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2045 2220
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2223
2049 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2080 2255
2081 { 2256 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2083 2258
2084 return unless $self->valid; 2259 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2261
2089 $self->alloc; 2262 $self->alloc;
2090 2263
2091 $self->pre_load; 2264 $self->pre_load;
2092 cf::cede_to_tick; 2265 cf::cede_to_tick;
2093 2266
2267 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2269 $f->skip_block;
2096 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2097 or return; 2271 or return;
2098 2272
2099 $self->post_load_original 2273 $self->post_load_original
2100 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2101 2275
2102 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2277 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2280 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2109 } 2284 }
2110 } 2285 }
2111 }
2112 2286
2113 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2114 2294
2115 cf::cede_to_tick; 2295 cf::cede_to_tick;
2116 # now do the right thing for maps 2296 # now do the right thing for maps
2117 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2122 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2303 $self->decay_objects;
2124 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2125 $self->update_buttons; 2305 $self->update_buttons;
2126 cf::cede_to_tick; 2306 cf::cede_to_tick;
2127 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2128 } 2308 }
2129 2309
2130 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2312 }
2135 2313
2136 $self->post_load; 2314 $self->post_load;
2315
2316 1
2137} 2317}
2138 2318
2139# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2149# if $self->per_party; 2329# if $self->per_party;
2150 2330
2151 $self 2331 $self
2152} 2332}
2153 2333
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2334sub find_sync {
2181 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2182 2336
2183 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2184} 2342}
2185 2343
2186sub do_load_sync { 2344sub do_load_sync {
2187 my ($map) = @_; 2345 my ($map) = @_;
2188 2346
2347 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2191 2350
2192 cf::sync_job { $map->load }; 2351 $map->load;
2193} 2352}
2194 2353
2195our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2197 2356
2198sub find_async { 2357sub find_async {
2199 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2200 2359
2201 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2202 2361
2203 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2205 } 2364 }
2206 2365
2207 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2208 2367
2209 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2268sub swap_out { 2427sub swap_out {
2269 my ($self) = @_; 2428 my ($self) = @_;
2270 2429
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2431
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2274 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2275 return if $self->players; 2434 return if $self->players;
2276 2435
2277 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2437 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2281 2440
2282 # then atomically save 2441 # then atomically save
2283 $self->_save; 2442 $self->_save;
2284 2443
2285 # then free the map 2444 # then free the map
… …
2309 2468
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2470
2312 return if $self->players; 2471 return if $self->players;
2313 2472
2314 warn "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2315 2474
2316 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2317 2476
2318 # need to save uniques path 2477 # need to save uniques path
2319 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2480
… …
2583 2742
2584Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2585 2744
2586The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2589map. 2748map.
2590 2749
2591Will never block. 2750Will never block.
2592 2751
2593=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2615 my ($self) = @_; 2774 my ($self) = @_;
2616 2775
2617 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2618 2777
2778 ++$self->{_link_recursion};
2779
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2781
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2623 2784
… …
2649 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2652 2813
2653 $map->load; 2814 $map->load;
2654 $map->load_neighbours;
2655 2815
2656 return unless $self->contr->active; 2816 return unless $self->contr->active;
2657 2817
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2660 2820 # entering was successful
2821 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2823 $self->activate_recursive;
2663} 2824 }
2664 2825
2826}
2827
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2829
2667Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
… …
2677 2840
2678our $GOTOGEN; 2841our $GOTOGEN;
2679 2842
2680sub cf::object::player::goto { 2843sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2682 2851
2683 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2854
2686 $self->enter_link; 2855 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2707 } 2876 }
2708 } 2877 }
2709 2878
2710 my $map = eval { 2879 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2881
2713 if ($map) { 2882 if ($map) {
2714 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2885 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2887 }
2719 2888
2720 $map 2889 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2731 } 2900 }
2732 2901
2733 $done->() if $done; 2902 $done->($self) if $done;
2734 })->prio (1); 2903 })->prio (1);
2735} 2904}
2736 2905
2737=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2738 2907
… …
2806 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2807 2976
2808 unless (eval { 2977 unless (eval {
2809 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2810 2979
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2822 3006
2823 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2824 3008
2825 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2835 3019
2836 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 3021 $self->leave_link;
2838 } 3022 }
2839 })->prio (1); 3023 })->prio (1);
2840} 3024}
2841 3025
… …
3068=cut 3252=cut
3069 3253
3070sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3071 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3072 3256
3073 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075 } elsif ($self->extcmd == 1) {
3076 #TODO: version 1, remove
3077 unshift @msg, msgtype => "reply", msgid => $id;
3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079 }
3080} 3260}
3081 3261
3082=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3083 3263
3084Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3139 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3140 3320
3141 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142 3322
3143 if (ref $msg) { 3323 if (ref $msg) {
3144 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145 "ARRAY" eq ref $msg
3146 ? @$msg
3147 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148 3325
3149 my @reply; 3326 my @reply;
3150 3327
3151 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3152 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3154 3331
3155 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3333 if $reply;
3157 3334
3158 } else { 3335 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3337 }
3161 3338
3162 cf::override; 3339 cf::override;
3163 }, 3340 },
3164); 3341);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3249) { 3426) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3429 for @funs;
3254} 3430}
3255 3431
… …
3294 local @cf::_safe_eval_args = values %vars; 3470 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3471 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3472 }
3297 3473
3298 if ($@) { 3474 if ($@) {
3299 warn "$@"; 3475 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3302 } 3478 }
3303 3479
3304 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3305} 3481}
3306 3482
… …
3331=cut 3507=cut
3332 3508
3333############################################################################# 3509#############################################################################
3334# the server's init and main functions 3510# the server's init and main functions
3335 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3535
3336sub load_facedata($) { 3536sub load_facedata($) {
3337 my ($path) = @_; 3537 my ($path) = @_;
3338 3538
3339 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3340 # for this (global event?) 3540 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3542
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3544
3345 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3346 3546
3347 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3548
3353 $facedata->{version} == 2 3549 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3551
3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3358 $facedata->{resource}{"res/exp_table"} = {
3359 type => FT_RSRC,
3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3362 };
3363 cf::cede_to_tick; 3552 cf::cede_to_tick;
3364 3553
3365 { 3554 {
3366 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3367 3556
3368 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3369 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370 3560
3371 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3375 3567
3376 cf::cede_to_tick; 3568 cf::cede_to_tick;
3377 } 3569 }
3378 3570
3379 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
… …
3384 3576
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3580 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3582 }
3391 3583
3392 cf::cede_to_tick; 3584 cf::cede_to_tick;
3393 } 3585 }
3394 } 3586 }
… …
3406 3598
3407 { 3599 {
3408 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3409 3601
3410 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3606
3607 cf::face::set_type $idx, $type;
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3416 } else { 3611 } else {
3417 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3418 } 3613 }
3419 3614
3420 cf::cede_to_tick; 3615 cf::cede_to_tick;
3421 } 3616 }
3422 } 3617 }
3423 3618
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3620
3426 1 3621 1
3427} 3622}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3623
3449register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3451 3626
3452 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
… …
3460 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3462 cf::arch::commit_load; 3637 cf::arch::commit_load;
3463 3638
3464 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3465} 3653}
3466 3654
3467sub reload_regions { 3655sub reload_regions {
3468 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3469 # for this (global event?) 3657 # for this (global event?)
… …
3484} 3672}
3485 3673
3486sub reload_archetypes { 3674sub reload_archetypes {
3487 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3488 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3489} 3686}
3490 3687
3491sub reload_treasures { 3688sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3494} 3691}
3495 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3496sub reload_resources { 3713sub reload_resources {
3497 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3498 3715
3716 reload_materials;
3499 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3500 reload_archetypes; 3720 reload_archetypes;
3501 reload_regions; 3721 reload_regions;
3502 reload_treasures; 3722 reload_treasures;
3503 3723
3504 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3505} 3725}
3506 3726
3507sub reload_config { 3727sub reload_config {
3508 warn "reloading config file...\n"; 3728 trace "reloading config file...\n";
3509 3729
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3730 my $config = load_file "$CONFDIR/config";
3511 or return; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3512 3733
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3735
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3738
3521 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3741 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3742 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3743 };
3526 warn $@ if $@; 3744 warn $@ if $@;
3527 } 3745 }
3528
3529 warn "finished reloading resource files\n";
3530} 3746}
3531 3747
3532sub pidfile() { 3748sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3749 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3750 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3548 print $fh $$; 3764 print $fh $$;
3549} 3765}
3550 3766
3551sub main_loop { 3767sub main_loop {
3552 warn "EV::loop starting\n"; 3768 trace "EV::loop starting\n";
3553 if (1) { 3769 if (1) {
3554 EV::loop; 3770 EV::loop;
3555 } 3771 }
3556 warn "EV::loop returned\n"; 3772 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3773 goto &main_loop unless $REALLY_UNLOOP;
3558} 3774}
3559 3775
3560sub main { 3776sub main {
3561 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3562 3778
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3783
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3785
3570 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3571 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3573 (async { 3789 (async {
3574 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3575 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3576 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3577 }; 3793 };
3578 3794
3579 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3580 3796
3581 cf::sync_job { 3797 cf::sync_job {
3582 cf::init_experience; 3798 cf::incloader::init ();
3799
3583 cf::init_anim; 3800 cf::init_anim;
3584 cf::init_attackmess; 3801 cf::init_attackmess;
3585 cf::init_dynamic; 3802 cf::init_dynamic;
3586 3803
3587 cf::load_settings; 3804 cf::load_settings;
3588 cf::load_materials;
3589 3805
3590 reload_resources; 3806 reload_resources;
3591 reload_config; 3807 reload_config;
3592 db_init; 3808 db_init;
3593 3809
… …
3605 3821
3606 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3823 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3825
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3611 }; 3827 };
3612 3828
3613 cf::object::thawer::errors_are_fatal 0; 3829 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3830 info "parse errors in files are no longer fatal from this point on.\n";
3615 3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3616 main_loop; 3836 goto &main_loop;
3617} 3837}
3618 3838
3619############################################################################# 3839#############################################################################
3620# initialisation and cleanup 3840# initialisation and cleanup
3621 3841
… …
3660 or return; 3880 or return;
3661 3881
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3883 and return;
3664 3884
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3886
3667 1 3887 1
3668} 3888}
3669 3889
3670our $uuid_lock; 3890our $uuid_lock;
… …
3682 or return; 3902 or return;
3683 3903
3684 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3685 3905
3686 unless ($value) { 3906 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3908 return;
3689 } 3909 }
3690 3910
3691 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3912 $uuid_skip = 0;
… …
3702 or return; 3922 or return;
3703 3923
3704 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3705 and return; 3925 and return;
3706 3926
3707 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3708 3928
3709 1 3929 1
3710 3930
3711} 3931}
3712 3932
… …
3718} 3938}
3719 3939
3720sub emergency_save() { 3940sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3722 3942
3723 warn "emergency_perl_save: enter\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3724 3949
3725 cf::sync_job { 3950 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3951 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3952
3731 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3959 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3961 $pl->save;
3740 } 3962 }
3741 warn "emergency_perl_save: end player save\n"; 3963 info "emergency_perl_save: end player save\n";
3742 3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3743 warn "emergency_perl_save: begin map save\n"; 3967 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3970 $map->valid or next;
3747 $map->save; 3971 $map->save;
3748 } 3972 }
3749 warn "emergency_perl_save: end map save\n"; 3973 info "emergency_perl_save: end map save\n";
3750 3974
3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3977 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3754 3980
3755 warn "emergency_perl_save: begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3982 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 4003 };
3759 4004
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 4005 info "emergency_perl_save: leave\n";
3766} 4006}
3767 4007
3768sub post_cleanup { 4008sub post_cleanup {
3769 my ($make_core) = @_; 4009 my ($make_core) = @_;
3770 4010
4011 IO::AIO::flush;
4012
3771 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 4014 if $make_core;
3773 4015
3774 my $fh = pidfile; 4016 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3776} 4018}
… …
3800 } 4042 }
3801} 4043}
3802 4044
3803sub do_reload_perl() { 4045sub do_reload_perl() {
3804 # can/must only be called in main 4046 # can/must only be called in main
3805 if (in_main) { 4047 unless (in_main) {
3806 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3807 return; 4049 return;
3808 } 4050 }
3809 4051
3810 return if $RELOAD++; 4052 return if $RELOAD++;
3811 4053
3812 my $t1 = AE::time; 4054 my $t1 = AE::time;
3813 4055
3814 while ($RELOAD) { 4056 while ($RELOAD) {
3815 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3816 4059
3817 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3818 4061
3819 cf::sync_job { 4062 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 4063 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 4064
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 4067 %EXT_CORO = ();
3837 4068
3838 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3839 %COMMAND = (); 4070 %COMMAND = ();
3840 4071
3841 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 4073 %EXTCMD = ();
3843 %EXTICMD = (); 4074 %EXTICMD = ();
3844 4075
3845 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3848 4079
3849 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3850 eval { 4081 eval {
3851 $cb->($pkg); 4082 $cb->($pkg);
3852 1 4083 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3854 } 4085 }
3855 4086
3856 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3857 clear_package $pkg; 4088 clear_package $pkg;
3858 } 4089 }
3859 4090
3860 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 4094
3864 warn "... unloading $k"; 4095 trace "... unloading $k";
3865 delete $INC{$k}; 4096 delete $INC{$k};
3866 4097
3867 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3869 4100
… …
3872 } 4103 }
3873 4104
3874 clear_package $k; 4105 clear_package $k;
3875 } 4106 }
3876 4107
3877 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4109 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4111
3881 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4115
3885 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4117 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3888 4119
3889 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3890 4121
3891 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3892 require cf; 4123 require cf;
3893 cf::_connect_to_perl_1; 4124 cf::_connect_to_perl_1;
3894 4125
3895 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4127 cf::reload_config;
3897 4128
3898 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4130 cf::load_extensions;
3900 4131
3901 if ($REATTACH_ON_RELOAD) { 4132 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
3908 } 4139 }
3909 4140
3910 warn "running post_init jobs"; 4141 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4142
3913 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3914 4144
3915 1 4145 1
3916 } or do { 4146 } or do {
3917 warn $@; 4147 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4149 };
3920 4150
3921 warn "reloaded";
3922 --$RELOAD; 4151 --$RELOAD;
3923 } 4152 }
3924 4153
3925 $t1 = AE::time - $t1; 4154 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4155 info "perl_reload: completed in ${t1}s\n";
3927}; 4156};
3928 4157
3929our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3930 4159
3931sub reload_perl() { 4160sub reload_perl() {
… …
3952 reload_perl; 4181 reload_perl;
3953 }; 4182 };
3954 } 4183 }
3955}; 4184};
3956 4185
3957unshift @INC, $LIBDIR; 4186#############################################################################
3958 4187
3959my $bug_warning = 0; 4188my $bug_warning = 0;
3960 4189
3961our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN;
3963
3964sub wait_for_tick { 4190sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4192
3967 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3968 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait;
3970} 4194}
3971 4195
3972sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974 4198
3975 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4201 $signal->wait;
3978} 4202}
… …
3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3984 return; 4208 return;
3985 } 4209 }
3986 4210
3987 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
3988 4212
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990 4214
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4217 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4219 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3997 }; 4221 };
3998 } 4222 }
3999 4223
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4225 $sig->send;
4002 } 4226 }
4003 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
4004 $sig->send;
4005 }
4006 4228
4007 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009 4231
4010 if (0) { 4232 if (0) {
4011 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
4015 } 4237 }
4016 } 4238 }
4017} 4239}
4018 4240
4019{ 4241{
4020 # configure BDB 4242 # configure BDB
4021 4243
4022 BDB::min_parallel 16; 4244 BDB::min_parallel 16;
4023 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
4024 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
4025 4247
4026 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
4027 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4064 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
4067} 4289}
4068 4290
4069my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
4070 4293
4071sub _log_backtrace { 4294sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
4073 4296
4074 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
4075 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4305 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
4080 async { 4307 async {
4081 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
4082 4309
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4330 --$_log_backtrace;
4104 }; 4331 };
4105 } else { 4332 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4335 }
4109} 4336}
4110 4337
4111# load additional modules 4338# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4339require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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