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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 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 = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
124our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $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)
152our $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;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The 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.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The 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
201every server tick. 227every server tick.
202 228
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 232
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 238=item $cf::LOADAVG
221 239
222The 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
223(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
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
233from wherever your confdir points to. 251from wherever your confdir points to.
234 252
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These 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
238returns 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
239per 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();
240 275
241=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
242 277
243This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
244C<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
252 287
253=back 288=back
254 289
255=cut 290=cut
256 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
257$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 299 my $msg = join "", @_;
259 300
260 $msg .= "\n" 301 $msg .= "\n"
261 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
262 303
263 $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;
264 305
265 LOG llevError, $msg; 306 LOG llevWarn, $msg;
266}; 307};
267 308
268$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
270 311
271 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
272 313
273 if (in_main) {#d# 314 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 316 return;#d#
276 }#d# 317 }#d#
277 318
278 # kill coroutine otherwise 319 # kill coroutine otherwise
279 Coro::terminate 320 Coro::terminate
299)) { 340)) {
300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301} 342}
302 343
303$EV::DIED = sub { 344$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
305}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
306 352
307############################################################################# 353#############################################################################
308 354
309=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
310 356
331 $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;
332 $d 378 $d
333 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
334} 380}
335 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
336=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
337 435
338Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
339 437
340=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
346our $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
347 445
348sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
352 481
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
355 484
356The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 486is a reload or not.
358 487
359=cut 488=cut
360 489
361sub post_init(&) { 490sub post_init(&) {
362 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 }
363} 509}
364 510
365=item cf::lock_wait $string 511=item cf::lock_wait $string
366 512
367Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
420 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
421} 567}
422 568
423=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
424 570
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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.
428 578
429The 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
430used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
431 581
432Useful for short background jobs. 582Useful for short background jobs.
461 } 611 }
462 } 612 }
463 613
464 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
465 # 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
466 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
467 $signal->wait;
468 } else { 617 } else {
469 $busy = 0; 618 $busy = 0;
470 Coro::schedule; 619 Coro::schedule;
471 } 620 }
472 } 621 }
512=cut 661=cut
513 662
514sub sync_job(&) { 663sub sync_job(&) {
515 my ($job) = @_; 664 my ($job) = @_;
516 665
517 if ($Coro::current == $Coro::main) { 666 if (in_main) {
518 my $time = AE::time; 667 my $time = AE::time;
519 668
520 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
522 671
523 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
524 673
525 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
526 675
527 my $busy = 1; 676 my $busy = 1;
528 my @res; 677 my @res;
529 678
530 (async { 679 (async {
531 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 681 @res = eval { $job->() };
533 warn $@ if $@; 682 error $@ if $@;
534 undef $busy; 683 undef $busy;
535 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
536 685
537 while ($busy) { 686 while ($busy) {
538 if (Coro::nready) { 687 if (Coro::nready) {
572 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
573 722
574 $coro 723 $coro
575} 724}
576 725
577=item fork_call { }, $args 726=item fork_call { }, @args
578 727
579Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 731never block itself or use any form of event handling.
583 732
584=cut 733=cut
585 734
735sub post_fork {
736 reset_signals;
737}
738
586sub fork_call(&@) { 739sub fork_call(&@) {
587 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
588 741
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
592 745
593 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
594 reset_signals; 747 cf::post_fork;
595 &$cb 748 &$cb
596 }, @args; 749 } @args;
597 750
598 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
599} 752}
600 753
601sub objinfo { 754sub objinfo {
651within each server. 804within each server.
652 805
653=cut 806=cut
654 807
655sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
656 my ($name) = @_; 812 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
658 814
659 eval { 815 eval {
660 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
670} 826}
671 827
672our $DB; 828our $DB;
673 829
674sub db_init { 830sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
677 };
678} 832}
679 833
680sub db_get($$) { 834sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
682 836
683 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
684 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
685 841
686 $! ? () 842 $! ? ()
687 : $data 843 : $data
688 }
689} 844}
690 845
691sub db_put($$$) { 846sub db_put($$$) {
692 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 876
722 my @data; 877 my @data;
723 my $md5; 878 my $md5;
724 879
725 for (0 .. $#$src) { 880 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 882 }
729 883
730 # if processing is expensive, check 884 # if processing is expensive, check
731 # checksum first 885 # checksum first
732 if (1) { 886 if (1) {
749 903
750 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 905 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
753 907
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 909
756 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
759 913
769 923
770=cut 924=cut
771 925
772sub datalog($@) { 926sub datalog($@) {
773 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 929}
776 930
777=back 931=back
778 932
779=cut 933=cut
974 1128
975 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1131
978 } elsif (ref $type) { 1132 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
980 1134
981 } else { 1135 } else {
982 shift @arg; 1136 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
984 } 1138 }
985 } 1139 }
986} 1140}
987 1141
988sub _object_attach { 1142sub _object_attach {
998 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
999 } 1153 }
1000 1154
1001 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
1002 } else { 1156 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1158 }
1005 1159
1006 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1007} 1161}
1008 1162
1067 1221
1068 for (@$callbacks) { 1222 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1070 1224
1071 if ($@) { 1225 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1227 override;
1075 } 1228 }
1076 1229
1077 return 1 if $override; 1230 return 1 if $override;
1078 } 1231 }
1157 for (@$attach) { 1310 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1160 } 1313 }
1161 } else { 1314 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1316 }
1164 } 1317 }
1165} 1318}
1166 1319
1167cf::attachable->attach ( 1320cf::attachable->attach (
1194 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1195 1348
1196 sync_job { 1349 sync_job {
1197 if (length $$rdata) { 1350 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1353 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1354 if $VERBOSE_IO;
1202 1355
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1228 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1229 1382
1230 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1385 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1234 } 1387 }
1235 } else { 1388 } else {
1236 aio_unlink $filename; 1389 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1238 } 1391 }
1262 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1416 $av = $st->{objs};
1264 } 1417 }
1265 1418
1266 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1421 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1422 if $VERBOSE_IO;
1270 1423
1271 ($data, $av) 1424 ($data, $av)
1272} 1425}
1273 1426
1351 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1352 1505
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1507
1355 if (ref $msg) { 1508 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1510
1361 my @reply; 1511 my @reply;
1362 1512
1363 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1364 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1366 1516
1367 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1518 if $reply;
1369 1519
1370 } else { 1520 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1522 }
1373 1523
1374 cf::override; 1524 cf::override;
1375 }, 1525 },
1376); 1526);
1386 }; 1536 };
1387 1537
1388 $grp 1538 $grp
1389} 1539}
1390 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
1391sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1392 cf::sync_job { 1557 cf::sync_job {
1393 my %todo; 1558 my %todo;
1394 1559
1395 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1561 next unless -r $path;
1414 1579
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1582
1418 $ext{source} = 1583 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1421 . $source 1586 . $source
1422 . "\n};\n1"; 1587 . "\n};\n1";
1423 1588
1424 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1436 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1602 next ext
1438 unless exists $done{$_}; 1603 unless exists $done{$_};
1439 } 1604 }
1440 1605
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 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
1443 my $active = eval $v->{source}; 1617 my $active = eval $source;
1444 1618
1445 if (length $@) { 1619 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1447 1621
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1450 1624
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1453 } else { 1627 } else {
1454 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1456 $progress = 1; 1630 $progress = 1;
1457 1631
1458 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1633 unless $active;
1460 } 1634 }
1461 } 1635 }
1462 1636
1463 unless ($progress) { 1637 unless ($progress) {
1465 1639
1466 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1469 } 1643 }
1644
1645 last;
1470 } 1646 }
1471 } 1647 }
1472 }; 1648 };
1473} 1649}
1474 1650
1632 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1633 1809
1634 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1635 $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
1636 1812
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1814 $pl->deactivate;
1815
1639 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;
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1641 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1642 1821
1643 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1645 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1811sub generate_random_map { 1990sub generate_random_map {
1812 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1813 1992
1814 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
1815 1994
1816 # mit "rum" bekleckern, nicht
1817 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821 $rmp->{exit_on_final_map},
1822 $rmp->{xsize}, $rmp->{ysize},
1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828 (cf::region::find $rmp->{region}), $rmp->{custom}
1829 )
1830} 1996}
1831 1997
1832=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1833 1999
1834Register 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
1839 2005
1840sub register { 2006sub register {
1841 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 2008 my $pkg = caller;
1843 2009
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 2011
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 2013}
1849 2014
1861} 2026}
1862 2027
1863sub normalise { 2028sub normalise {
1864 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1865 2030
1866 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1867 2032
1868 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1869 2034
1870 # map plan: 2035 # map plan:
1871 # 2036 #
1886 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1887 $path = "$base/$path"; 2052 $path = "$base/$path";
1888 } 2053 }
1889 2054
1890 for ($path) { 2055 for ($path) {
1891 redo if s{//}{/};
1892 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1893 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1894 } 2058 }
1895 2059
1896 $path 2060 $path
1910 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1911 return $self; 2075 return $self;
1912 } 2076 }
1913 } 2077 }
1914 2078
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 2080 ()
1917} 2081}
1918 2082
2083# may re-bless or do other evil things
1919sub init { 2084sub init {
1920 my ($self) = @_; 2085 my ($self) = @_;
1921 2086
1922 $self 2087 $self
1923} 2088}
1988 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1989 2154
1990 1 2155 1
1991} 2156}
1992 2157
2158# used to laod the header of an original map
1993sub load_header_orig { 2159sub load_header_orig {
1994 my ($self) = @_; 2160 my ($self) = @_;
1995 2161
1996 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1997} 2163}
1998 2164
2165# used to laod the header of an instantiated map
1999sub load_header_temp { 2166sub load_header_temp {
2000 my ($self) = @_; 2167 my ($self) = @_;
2001 2168
2002 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2003} 2170}
2004 2171
2172# called after loading the header from an instantiated map
2005sub prepare_temp { 2173sub prepare_temp {
2006 my ($self) = @_; 2174 my ($self) = @_;
2007 2175
2008 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2009 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2010 # safety 2178 # safety
2011 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2012 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2013} 2181}
2014 2182
2183# called after loading the header from an original map
2015sub prepare_orig { 2184sub prepare_orig {
2016 my ($self) = @_; 2185 my ($self) = @_;
2017 2186
2018 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2019 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
2043 2212
2044sub find; 2213sub find;
2045sub find { 2214sub find {
2046 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2047 2216
2217 cf::cede_to_tick;
2218
2048 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2049 2220
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2052 2223
2053 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
2084 2255
2085 { 2256 {
2086 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2087 2258
2088 return unless $self->valid; 2259 return unless $self->valid;
2089 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2090
2091 $self->in_memory (cf::MAP_LOADING);
2092 2261
2093 $self->alloc; 2262 $self->alloc;
2094 2263
2095 $self->pre_load; 2264 $self->pre_load;
2096 cf::cede_to_tick; 2265 cf::cede_to_tick;
2097 2266
2267 if (exists $self->{load_path}) {
2098 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2099 $f->skip_block; 2269 $f->skip_block;
2100 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2101 or return; 2271 or return;
2102 2272
2103 $self->post_load_original 2273 $self->post_load_original
2104 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2105 2275
2106 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2107 utf8::encode $uniq; 2277 utf8::encode $uniq;
2108 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2109 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2110 $self->clear_unique_items; 2280 $self->clear_unique_items;
2111 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2112 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2113 } 2284 }
2114 } 2285 }
2115 }
2116 2286
2117 $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);
2118 2294
2119 cf::cede_to_tick; 2295 cf::cede_to_tick;
2120 # now do the right thing for maps 2296 # now do the right thing for maps
2121 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2122 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2126 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2127 $self->decay_objects; 2303 $self->decay_objects;
2128 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2129 $self->update_buttons; 2305 $self->update_buttons;
2130 cf::cede_to_tick; 2306 cf::cede_to_tick;
2131 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2132 } 2308 }
2133 2309
2134 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2135 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2136
2137 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2312 }
2139 2313
2140 $self->post_load; 2314 $self->post_load;
2315
2316 1
2141} 2317}
2142 2318
2143# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
2153# if $self->per_party; 2329# if $self->per_party;
2154 2330
2155 $self 2331 $self
2156} 2332}
2157 2333
2158# find and load all maps in the 3x3 area around a map
2159sub load_neighbours {
2160 my ($map) = @_;
2161
2162 my @neigh; # diagonal neighbours
2163
2164 for (0 .. 3) {
2165 my $neigh = $map->tile_path ($_)
2166 or next;
2167 $neigh = find $neigh, $map
2168 or next;
2169 $neigh->load;
2170
2171 # now find the diagonal neighbours
2172 push @neigh,
2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2175 }
2176
2177 for (grep defined $_->[0], @neigh) {
2178 my ($path, $origin) = @$_;
2179 my $neigh = find $path, $origin
2180 or next;
2181 $neigh->load;
2182 }
2183}
2184
2185sub find_sync { 2334sub find_sync {
2186 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2187 2336
2188 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
2189} 2342}
2190 2343
2191sub do_load_sync { 2344sub do_load_sync {
2192 my ($map) = @_; 2345 my ($map) = @_;
2193 2346
2347 # it's a bug to call this from the main context
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2196 2350
2197 cf::sync_job { $map->load }; 2351 $map->load;
2198} 2352}
2199 2353
2200our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2202 2356
2203sub find_async { 2357sub find_async {
2204 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2205 2359
2206 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2207 2361
2208 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2210 } 2364 }
2211 2365
2212 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2213 2367
2214 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2273sub swap_out { 2427sub swap_out {
2274 my ($self) = @_; 2428 my ($self) = @_;
2275 2429
2276 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277 2431
2278 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2279 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2280 return if $self->players; 2434 return if $self->players;
2281 2435
2282 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate; 2437 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2285 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2286 2440
2287 # then atomically save 2441 # then atomically save
2288 $self->_save; 2442 $self->_save;
2289 2443
2290 # then free the map 2444 # then free the map
2314 2468
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2470
2317 return if $self->players; 2471 return if $self->players;
2318 2472
2319 warn "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2320 2474
2321 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2322 2476
2323 # need to save uniques path 2477 # need to save uniques path
2324 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326 2480
2656 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2657 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2658 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2659 2813
2660 $map->load; 2814 $map->load;
2661 $map->load_neighbours;
2662 2815
2663 return unless $self->contr->active; 2816 return unless $self->contr->active;
2664 2817
2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
2689 2842
2690sub cf::object::player::goto { 2843sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2845
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2850 }
2698 2851
2699 # 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
2722 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2723 } 2876 }
2724 } 2877 }
2725 2878
2726 my $map = eval { 2879 my $map = eval {
2727 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728 2881
2729 if ($map) { 2882 if ($map) {
2730 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2731 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2732 } else { 2885 } else {
2822 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2823 2976
2824 unless (eval { 2977 unless (eval {
2825 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2826 2979
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2836 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2837 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 }
2838 3006
2839 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2840 3008
2841 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2847 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "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. "
2849 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2851 3019
2852 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 3021 $self->leave_link;
2854 } 3022 }
2855 })->prio (1); 3023 })->prio (1);
2856} 3024}
2857 3025
3067=cut 3235=cut
3068 3236
3069sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3070 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3071 3239
3072 if ($self->extcmd == 2) {
3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3074 } elsif ($self->extcmd == 1) { # TODO: remove
3075 push @msg, msgtype => "event_$type";
3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3077 }
3078} 3241}
3079 3242
3080=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3081 3244
3082Sends an ext reply to the client. 3245Sends an ext reply to the client.
3084=cut 3247=cut
3085 3248
3086sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3087 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3088 3251
3089 if ($self->extcmd == 2) {
3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091 } elsif ($self->extcmd == 1) {
3092 #TODO: version 1, remove
3093 unshift @msg, msgtype => "reply", msgid => $id;
3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095 }
3096} 3253}
3097 3254
3098=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3099 3256
3100Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
3155 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3156 3313
3157 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158 3315
3159 if (ref $msg) { 3316 if (ref $msg) {
3160 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161 "ARRAY" eq ref $msg
3162 ? @$msg
3163 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164 3318
3165 my @reply; 3319 my @reply;
3166 3320
3167 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3168 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3170 3324
3171 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3326 if $reply;
3173 3327
3174 } else { 3328 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3330 }
3177 3331
3178 cf::override; 3332 cf::override;
3179 }, 3333 },
3180); 3334);
3261 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3265) { 3419) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3422 for @funs;
3270} 3423}
3271 3424
3310 local @cf::_safe_eval_args = values %vars; 3463 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3464 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3465 }
3313 3466
3314 if ($@) { 3467 if ($@) {
3315 warn "$@"; 3468 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3318 } 3471 }
3319 3472
3320 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3321} 3474}
3322 3475
3347=cut 3500=cut
3348 3501
3349############################################################################# 3502#############################################################################
3350# the server's init and main functions 3503# the server's init and main functions
3351 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3352sub load_facedata($) { 3529sub load_facedata($) {
3353 my ($path) = @_; 3530 my ($path) = @_;
3354 3531
3355 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3356 # for this (global event?) 3533 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3535
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3537
3361 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3362 3539
3363 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3364 0 < aio_load $path, $facedata
3365 or die "$path: $!";
3366
3367 $facedata = Coro::Storable::thaw $facedata;
3368 3541
3369 $facedata->{version} == 2 3542 $facedata->{version} == 2
3370 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3371 3544
3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3374 $facedata->{resource}{"res/exp_table"} = {
3375 type => FT_RSRC,
3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3378 };
3379 cf::cede_to_tick; 3545 cf::cede_to_tick;
3380 3546
3381 { 3547 {
3382 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3383 3549
3384 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3385 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386 3553
3387 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3391 3560
3392 cf::cede_to_tick; 3561 cf::cede_to_tick;
3393 } 3562 }
3394 3563
3395 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3400 3569
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3573 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3575 }
3407 3576
3408 cf::cede_to_tick; 3577 cf::cede_to_tick;
3409 } 3578 }
3410 } 3579 }
3422 3591
3423 { 3592 {
3424 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3425 3594
3426 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3427 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3599
3600 cf::face::set_type $idx, $type;
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3432 } else { 3604 } else {
3433 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3434 } 3606 }
3435 3607
3436 cf::cede_to_tick; 3608 cf::cede_to_tick;
3437 } 3609 }
3438 } 3610 }
3439 3611
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441 3613
3442 1 3614 1
3443} 3615}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3464 3616
3465register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3466 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3467 3619
3468 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3476 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3477 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3478 cf::arch::commit_load; 3630 cf::arch::commit_load;
3479 3631
3480 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3481} 3646}
3482 3647
3483sub reload_regions { 3648sub reload_regions {
3484 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3485 # for this (global event?) 3650 # for this (global event?)
3500} 3665}
3501 3666
3502sub reload_archetypes { 3667sub reload_archetypes {
3503 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3504 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3505} 3679}
3506 3680
3507sub reload_treasures { 3681sub reload_treasures {
3508 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3509 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3510} 3684}
3511 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3512sub reload_resources { 3761sub reload_resources {
3513 warn "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3514 3763
3764 reload_materials;
3515 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3767 reload_sound;
3516 reload_archetypes; 3768 reload_archetypes;
3517 reload_regions; 3769 reload_regions;
3518 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3519 3772
3520 warn "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3521} 3774}
3522 3775
3523sub reload_config { 3776sub reload_config {
3524 warn "reloading config file...\n"; 3777 trace "reloading config file...\n";
3525 3778
3526 open my $fh, "<:utf8", "$CONFDIR/config" 3779 my $config = load_file "$CONFDIR/config";
3527 or return; 3780 utf8::decode $config;
3528 3781 *CFG = decode_yaml $config;
3529 local $/;
3530 *CFG = YAML::XS::Load scalar <$fh>;
3531 3782
3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533 3784
3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3785 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3786 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3790 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540 and die "WARNING: m(un)lockall failed: $!\n"; 3791 and die "WARNING: m(un)lockall failed: $!\n";
3541 }; 3792 };
3542 warn $@ if $@; 3793 warn $@ if $@;
3543 } 3794 }
3544
3545 warn "finished reloading resource files\n";
3546} 3795}
3547 3796
3548sub pidfile() { 3797sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3798 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!"; 3799 or die "$PIDFILE: $!";
3563 seek $fh, 0, 0; 3812 seek $fh, 0, 0;
3564 print $fh $$; 3813 print $fh $$;
3565} 3814}
3566 3815
3567sub main_loop { 3816sub main_loop {
3568 warn "EV::loop starting\n"; 3817 trace "EV::loop starting\n";
3569 if (1) { 3818 if (1) {
3570 EV::loop; 3819 EV::loop;
3571 } 3820 }
3572 warn "EV::loop returned\n"; 3821 trace "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP; 3822 goto &main_loop unless $REALLY_UNLOOP;
3574} 3823}
3575 3824
3576sub main { 3825sub main {
3577 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3578 3827
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583 3832
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585 3834
3586 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3587 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3589 (async { 3838 (async {
3590 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3591 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3592 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
3593 }; 3842 };
3594 3843
3595 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3596 3845
3597 cf::sync_job { 3846 cf::sync_job {
3598 cf::init_experience; 3847 cf::incloader::init ();
3848
3849 db_init;
3850
3599 cf::init_anim; 3851 cf::init_anim;
3600 cf::init_attackmess; 3852 cf::init_attackmess;
3601 cf::init_dynamic; 3853 cf::init_dynamic;
3602 3854
3603 cf::load_settings; 3855 cf::load_settings;
3604 cf::load_materials;
3605 3856
3606 reload_resources; 3857 reload_resources;
3607 reload_config; 3858 reload_config;
3608 db_init;
3609 3859
3610 cf::init_uuid; 3860 cf::init_uuid;
3611 cf::init_signals; 3861 cf::init_signals;
3612 cf::init_skills; 3862 cf::init_skills;
3613 3863
3621 3871
3622 # no (long-running) fork's whatsoever before this point(!) 3872 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX (); 3873 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3874 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625 3875
3626 (pop @POST_INIT)->(0) while @POST_INIT; 3876 cf::_post_init 0;
3627 }; 3877 };
3628 3878
3629 cf::object::thawer::errors_are_fatal 0; 3879 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n"; 3880 info "parse errors in files are no longer fatal from this point on.\n";
3631 3881
3882 AE::postpone {
3883 undef &main; # free gobs of memory :)
3884 };
3885
3632 main_loop; 3886 goto &main_loop;
3633} 3887}
3634 3888
3635############################################################################# 3889#############################################################################
3636# initialisation and cleanup 3890# initialisation and cleanup
3637 3891
3676 or return; 3930 or return;
3677 3931
3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3932 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679 and return; 3933 and return;
3680 3934
3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3935 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682 3936
3683 1 3937 1
3684} 3938}
3685 3939
3686our $uuid_lock; 3940our $uuid_lock;
3698 or return; 3952 or return;
3699 3953
3700 my $value = uuid_seq uuid_cur; 3954 my $value = uuid_seq uuid_cur;
3701 3955
3702 unless ($value) { 3956 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n"; 3957 info "cowardly refusing to write zero uuid value!\n";
3704 return; 3958 return;
3705 } 3959 }
3706 3960
3707 my $value = uuid_str $value + $uuid_skip; 3961 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0; 3962 $uuid_skip = 0;
3718 or return; 3972 or return;
3719 3973
3720 aio_rename "$uuid~", $uuid 3974 aio_rename "$uuid~", $uuid
3721 and return; 3975 and return;
3722 3976
3723 warn "uuid file written ($value).\n"; 3977 trace "uuid file written ($value).\n";
3724 3978
3725 1 3979 1
3726 3980
3727} 3981}
3728 3982
3734} 3988}
3735 3989
3736sub emergency_save() { 3990sub emergency_save() {
3737 my $freeze_guard = cf::freeze_mainloop; 3991 my $freeze_guard = cf::freeze_mainloop;
3738 3992
3739 warn "emergency_perl_save: enter\n"; 3993 info "emergency_perl_save: enter\n";
3994
3995 # this is a trade-off: we want to be very quick here, so
3996 # save all maps without fsync, and later call a global sync
3997 # (which in turn might be very very slow)
3998 local $USE_FSYNC = 0;
3740 3999
3741 cf::sync_job { 4000 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so 4001 cf::write_runtime_sync; # external watchdog should not bark
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746 4002
3747 # use a peculiar iteration method to avoid tripping on perl 4003 # use a peculiar iteration method to avoid tripping on perl
3748 # refcount bugs in for. also avoids problems with players 4004 # refcount bugs in for. also avoids problems with players
3749 # and maps saved/destroyed asynchronously. 4005 # and maps saved/destroyed asynchronously.
3750 warn "emergency_perl_save: begin player save\n"; 4006 info "emergency_perl_save: begin player save\n";
3751 for my $login (keys %cf::PLAYER) { 4007 for my $login (keys %cf::PLAYER) {
3752 my $pl = $cf::PLAYER{$login} or next; 4008 my $pl = $cf::PLAYER{$login} or next;
3753 $pl->valid or next; 4009 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4010 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755 $pl->save; 4011 $pl->save;
3756 } 4012 }
3757 warn "emergency_perl_save: end player save\n"; 4013 info "emergency_perl_save: end player save\n";
3758 4014
4015 cf::write_runtime_sync; # external watchdog should not bark
4016
3759 warn "emergency_perl_save: begin map save\n"; 4017 info "emergency_perl_save: begin map save\n";
3760 for my $path (keys %cf::MAP) { 4018 for my $path (keys %cf::MAP) {
3761 my $map = $cf::MAP{$path} or next; 4019 my $map = $cf::MAP{$path} or next;
3762 $map->valid or next; 4020 $map->valid or next;
3763 $map->save; 4021 $map->save;
3764 } 4022 }
3765 warn "emergency_perl_save: end map save\n"; 4023 info "emergency_perl_save: end map save\n";
3766 4024
4025 cf::write_runtime_sync; # external watchdog should not bark
4026
3767 warn "emergency_perl_save: begin database checkpoint\n"; 4027 info "emergency_perl_save: begin database checkpoint\n";
3768 BDB::db_env_txn_checkpoint $DB_ENV; 4028 BDB::db_env_txn_checkpoint $DB_ENV;
3769 warn "emergency_perl_save: end database checkpoint\n"; 4029 info "emergency_perl_save: end database checkpoint\n";
3770 4030
3771 warn "emergency_perl_save: begin write uuid\n"; 4031 info "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1; 4032 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n"; 4033 info "emergency_perl_save: end write uuid\n";
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
4036
4037 trace "emergency_perl_save: syncing database to disk";
4038 BDB::db_env_txn_checkpoint $DB_ENV;
4039
4040 info "emergency_perl_save: starting sync\n";
4041 IO::AIO::aio_sync sub {
4042 info "emergency_perl_save: finished sync\n";
4043 };
4044
4045 cf::write_runtime_sync; # external watchdog should not bark
4046
4047 trace "emergency_perl_save: flushing outstanding aio requests";
4048 while (IO::AIO::nreqs || BDB::nreqs) {
4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4050 }
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
3774 }; 4053 };
3775 4054
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3781 warn "emergency_perl_save: leave\n"; 4055 info "emergency_perl_save: leave\n";
3782} 4056}
3783 4057
3784sub post_cleanup { 4058sub post_cleanup {
3785 my ($make_core) = @_; 4059 my ($make_core) = @_;
3786 4060
4061 IO::AIO::flush;
4062
3787 warn Carp::longmess "post_cleanup backtrace" 4063 error Carp::longmess "post_cleanup backtrace"
3788 if $make_core; 4064 if $make_core;
3789 4065
3790 my $fh = pidfile; 4066 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$; 4067 unlink $PIDFILE if <$fh> == $$;
3792} 4068}
3816 } 4092 }
3817} 4093}
3818 4094
3819sub do_reload_perl() { 4095sub do_reload_perl() {
3820 # can/must only be called in main 4096 # can/must only be called in main
3821 if (in_main) { 4097 unless (in_main) {
3822 warn "can only reload from main coroutine"; 4098 error "can only reload from main coroutine";
3823 return; 4099 return;
3824 } 4100 }
3825 4101
3826 return if $RELOAD++; 4102 return if $RELOAD++;
3827 4103
3828 my $t1 = AE::time; 4104 my $t1 = AE::time;
3829 4105
3830 while ($RELOAD) { 4106 while ($RELOAD) {
3831 warn "reloading..."; 4107 cf::get_slot 0.1, -1, "reload_perl";
4108 info "perl_reload: reloading...";
3832 4109
3833 warn "entering sync_job"; 4110 trace "perl_reload: entering sync_job";
3834 4111
3835 cf::sync_job { 4112 cf::sync_job {
3836 cf::write_runtime_sync; # external watchdog should not bark
3837 cf::emergency_save; 4113 #cf::emergency_save;
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 4114
3840 warn "syncing database to disk";
3841 BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843 # if anything goes wrong in here, we should simply crash as we already saved
3844
3845 warn "flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 warn "cancelling all extension coros"; 4115 trace "perl_reload: cancelling all extension coros";
3851 $_->cancel for values %EXT_CORO; 4116 $_->cancel for values %EXT_CORO;
3852 %EXT_CORO = (); 4117 %EXT_CORO = ();
3853 4118
3854 warn "removing commands"; 4119 trace "perl_reload: removing commands";
3855 %COMMAND = (); 4120 %COMMAND = ();
3856 4121
3857 warn "removing ext/exti commands"; 4122 trace "perl_reload: removing ext/exti commands";
3858 %EXTCMD = (); 4123 %EXTCMD = ();
3859 %EXTICMD = (); 4124 %EXTICMD = ();
3860 4125
3861 warn "unloading/nuking all extensions"; 4126 trace "perl_reload: unloading/nuking all extensions";
3862 for my $pkg (@EXTS) { 4127 for my $pkg (@EXTS) {
3863 warn "... unloading $pkg"; 4128 trace "... unloading $pkg";
3864 4129
3865 if (my $cb = $pkg->can ("unload")) { 4130 if (my $cb = $pkg->can ("unload")) {
3866 eval { 4131 eval {
3867 $cb->($pkg); 4132 $cb->($pkg);
3868 1 4133 1
3869 } or warn "$pkg unloaded, but with errors: $@"; 4134 } or error "$pkg unloaded, but with errors: $@";
3870 } 4135 }
3871 4136
3872 warn "... clearing $pkg"; 4137 trace "... clearing $pkg";
3873 clear_package $pkg; 4138 clear_package $pkg;
3874 } 4139 }
3875 4140
3876 warn "unloading all perl modules loaded from $LIBDIR"; 4141 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) { 4142 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4143 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879 4144
3880 warn "... unloading $k"; 4145 trace "... unloading $k";
3881 delete $INC{$k}; 4146 delete $INC{$k};
3882 4147
3883 $k =~ s/\.pm$//; 4148 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g; 4149 $k =~ s/\//::/g;
3885 4150
3888 } 4153 }
3889 4154
3890 clear_package $k; 4155 clear_package $k;
3891 } 4156 }
3892 4157
3893 warn "getting rid of safe::, as good as possible"; 4158 trace "perl_reload: getting rid of safe::, as good as possible";
3894 clear_package "safe::$_" 4159 clear_package "safe::$_"
3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4160 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3896 4161
3897 warn "unloading cf.pm \"a bit\""; 4162 trace "perl_reload: unloading cf.pm \"a bit\"";
3898 delete $INC{"cf.pm"}; 4163 delete $INC{"cf.pm"};
3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4164 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900 4165
3901 # don't, removes xs symbols, too, 4166 # don't, removes xs symbols, too,
3902 # and global variables created in xs 4167 # and global variables created in xs
3903 #clear_package __PACKAGE__; 4168 #clear_package __PACKAGE__;
3904 4169
3905 warn "unload completed, starting to reload now"; 4170 info "perl_reload: unload completed, starting to reload now";
3906 4171
3907 warn "reloading cf.pm"; 4172 trace "perl_reload: reloading cf.pm";
3908 require cf; 4173 require cf;
3909 cf::_connect_to_perl_1; 4174 cf::_connect_to_perl_1;
3910 4175
3911 warn "loading config and database again"; 4176 trace "perl_reload: loading config and database again";
3912 cf::reload_config; 4177 cf::reload_config;
3913 4178
3914 warn "loading extensions"; 4179 trace "perl_reload: loading extensions";
3915 cf::load_extensions; 4180 cf::load_extensions;
3916 4181
3917 if ($REATTACH_ON_RELOAD) { 4182 if ($REATTACH_ON_RELOAD) {
3918 warn "reattaching attachments to objects/players"; 4183 trace "perl_reload: reattaching attachments to objects/players";
3919 _global_reattach; # objects, sockets 4184 _global_reattach; # objects, sockets
3920 warn "reattaching attachments to maps"; 4185 trace "perl_reload: reattaching attachments to maps";
3921 reattach $_ for values %MAP; 4186 reattach $_ for values %MAP;
3922 warn "reattaching attachments to players"; 4187 trace "perl_reload: reattaching attachments to players";
3923 reattach $_ for values %PLAYER; 4188 reattach $_ for values %PLAYER;
3924 } 4189 }
3925 4190
3926 warn "running post_init jobs"; 4191 cf::_post_init 1;
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928 4192
3929 warn "leaving sync_job"; 4193 trace "perl_reload: leaving sync_job";
3930 4194
3931 1 4195 1
3932 } or do { 4196 } or do {
3933 warn $@; 4197 error $@;
3934 cf::cleanup "error while reloading, exiting."; 4198 cf::cleanup "perl_reload: error, exiting.";
3935 }; 4199 };
3936 4200
3937 warn "reloaded";
3938 --$RELOAD; 4201 --$RELOAD;
3939 } 4202 }
3940 4203
3941 $t1 = AE::time - $t1; 4204 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n"; 4205 info "perl_reload: completed in ${t1}s\n";
3943}; 4206};
3944 4207
3945our $RELOAD_WATCHER; # used only during reload 4208our $RELOAD_WATCHER; # used only during reload
3946 4209
3947sub reload_perl() { 4210sub reload_perl() {
3968 reload_perl; 4231 reload_perl;
3969 }; 4232 };
3970 } 4233 }
3971}; 4234};
3972 4235
3973unshift @INC, $LIBDIR; 4236#############################################################################
3974 4237
3975my $bug_warning = 0; 4238my $bug_warning = 0;
3976 4239
3977our @WAIT_FOR_TICK;
3978our @WAIT_FOR_TICK_BEGIN;
3979
3980sub wait_for_tick { 4240sub wait_for_tick() {
3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3982 4242
3983 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
3984 push @WAIT_FOR_TICK, $signal;
3985 $signal->wait;
3986} 4244}
3987 4245
3988sub wait_for_tick_begin { 4246sub wait_for_tick_begin() {
3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3990 4248
3991 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
3992 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
3993 $signal->wait; 4251 $signal->wait;
3994} 4252}
3998 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3999 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
4000 return; 4258 return;
4001 } 4259 }
4002 4260
4003 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4004 4262
4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4006 4264
4007 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4009 Coro::async_pool { 4267 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver"; 4268 $Coro::current->{desc} = "runtime saver";
4011 write_runtime_sync 4269 write_runtime_sync
4012 or warn "ERROR: unable to write runtime file: $!"; 4270 or error "ERROR: unable to write runtime file: $!";
4013 }; 4271 };
4014 } 4272 }
4015 4273
4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017 $sig->send; 4275 $sig->send;
4018 } 4276 }
4019 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
4020 $sig->send;
4021 }
4022 4278
4023 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
4024 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4025 4281
4026 if (0) { 4282 if (0) {
4027 if ($NEXT_TICK) { 4283 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK; 4284 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4285 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d# 4286 debug "jitter $JITTER\n";#d#
4031 } 4287 }
4032 } 4288 }
4033} 4289}
4034 4290
4035{ 4291{
4036 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4037 4294
4038 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4039 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4040 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4041 4298
4042 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
4043 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
4044 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4045 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4302 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4070 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4071 }; 4328 };
4072 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4073 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4074 }; 4331 };
4332
4333 info "database initialised";
4075} 4334}
4076 4335
4077{ 4336{
4078 # configure IO::AIO 4337 # configure IO::AIO
4079 4338
4339 info "initialising aio";
4080 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4081 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4082 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4083} 4344}
4084 4345
4085my $_log_backtrace; 4346our $_log_backtrace;
4347our $_log_backtrace_last;
4086 4348
4087sub _log_backtrace { 4349sub _log_backtrace {
4088 my ($msg, @addr) = @_; 4350 my ($msg, @addr) = @_;
4089 4351
4090 $msg =~ s/\n//; 4352 $msg =~ s/\n$//;
4091 4353
4354 if ($_log_backtrace_last eq $msg) {
4355 LOG llevInfo, "[ABT] $msg\n";
4356 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092 # limit the # of concurrent backtraces 4357 # limit the # of concurrent backtraces
4093 if ($_log_backtrace < 2) { 4358 } elsif ($_log_backtrace < 2) {
4359 $_log_backtrace_last = $msg;
4094 ++$_log_backtrace; 4360 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg; 4361 my $perl_bt = Carp::longmess $msg;
4096 async { 4362 async {
4097 $Coro::current->{desc} = "abt $msg"; 4363 $Coro::current->{desc} = "abt $msg";
4098 4364
4118 LOG llevInfo, "[ABT] $_\n" for @bt; 4384 LOG llevInfo, "[ABT] $_\n" for @bt;
4119 --$_log_backtrace; 4385 --$_log_backtrace;
4120 }; 4386 };
4121 } else { 4387 } else {
4122 LOG llevInfo, "[ABT] $msg\n"; 4388 LOG llevInfo, "[ABT] $msg\n";
4123 LOG llevInfo, "[ABT] [suppressed]\n"; 4389 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124 } 4390 }
4125} 4391}
4126 4392
4127# load additional modules 4393# load additional modules
4128require "cf/$_.pm" for @EXTRA_MODULES; 4394require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines