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.519 by root, Fri Apr 16 02:32:25 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 = 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
… …
165 179
166our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
167 181
168sub cf::map::normalise; 182sub cf::map::normalise;
169 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
170############################################################################# 188#############################################################################
171 189
172%REFLECT = (); 190%REFLECT = ();
173for (@REFLECT) { 191for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
184 202
185=over 4 203=over 4
186 204
187=item $cf::UPTIME 205=item $cf::UPTIME
188 206
189The 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.
190 223
191=item $cf::RUNTIME 224=item $cf::RUNTIME
192 225
193The 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
194every server tick. 227every server tick.
195 228
196=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199 232
200Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
203database environment. 236database environment.
204 237
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 238=item $cf::LOADAVG
214 239
215The 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
216(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
217objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 251from wherever your confdir points to.
227 252
228=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
229 254
230These 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
231returns 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
232per 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();
233 275
234=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
235 277
236This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 287
246=back 288=back
247 289
248=cut 290=cut
249 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
250$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 299 my $msg = join "", @_;
252 300
253 $msg .= "\n" 301 $msg .= "\n"
254 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
255 303
256 $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;
257 305
258 LOG llevError, $msg; 306 LOG llevWarn, $msg;
259}; 307};
260 308
261$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
263 311
264 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
265 313
266 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 316 return;#d#
269 }#d# 317 }#d#
270 318
271 # kill coroutine otherwise 319 # kill coroutine otherwise
272 Coro::terminate 320 Coro::terminate
… …
292)) { 340)) {
293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294} 342}
295 343
296$EV::DIED = sub { 344$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
298}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
299 352
300############################################################################# 353#############################################################################
301 354
302=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
303 356
… …
324 $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;
325 $d 378 $d
326 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
327} 380}
328 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
329=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
330 435
331Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
332 437
333=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
339our $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
340 445
341sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
345 481
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
348 484
349The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 486is a reload or not.
351 487
352=cut 488=cut
353 489
354sub post_init(&) { 490sub post_init(&) {
355 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 }
356} 509}
357 510
358=item cf::lock_wait $string 511=item cf::lock_wait $string
359 512
360Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
413 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
414} 567}
415 568
416=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
417 570
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
419This 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
420of 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.
421 578
422The 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
423used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
424 581
425Useful for short background jobs. 582Useful for short background jobs.
… …
454 } 611 }
455 } 612 }
456 613
457 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
458 # 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
459 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 617 } else {
462 $busy = 0; 618 $busy = 0;
463 Coro::schedule; 619 Coro::schedule;
464 } 620 }
465 } 621 }
… …
505=cut 661=cut
506 662
507sub sync_job(&) { 663sub sync_job(&) {
508 my ($job) = @_; 664 my ($job) = @_;
509 665
510 if ($Coro::current == $Coro::main) { 666 if (in_main) {
511 my $time = AE::time; 667 my $time = AE::time;
512 668
513 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
515 671
516 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
517 673
518 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
519 675
520 my $busy = 1; 676 my $busy = 1;
521 my @res; 677 my @res;
522 678
523 (async { 679 (async {
524 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 681 @res = eval { $job->() };
526 warn $@ if $@; 682 error $@ if $@;
527 undef $busy; 683 undef $busy;
528 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
529 685
530 while ($busy) { 686 while ($busy) {
531 if (Coro::nready) { 687 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
566 722
567 $coro 723 $coro
568} 724}
569 725
570=item fork_call { }, $args 726=item fork_call { }, @args
571 727
572Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 731never block itself or use any form of event handling.
576 732
577=cut 733=cut
578 734
735sub post_fork {
736 reset_signals;
737}
738
579sub fork_call(&@) { 739sub fork_call(&@) {
580 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
581 741
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
585 745
586 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
587 reset_signals; 747 cf::post_fork;
588 &$cb 748 &$cb
589 }, @args; 749 } @args;
590 750
591 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
592} 752}
593 753
594sub objinfo { 754sub objinfo {
… …
644within each server. 804within each server.
645 805
646=cut 806=cut
647 807
648sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
649 my ($name) = @_; 812 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
651 814
652 eval { 815 eval {
653 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
663} 826}
664 827
665our $DB; 828our $DB;
666 829
667sub db_init { 830sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
670 };
671} 832}
672 833
673sub db_get($$) { 834sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
675 836
676 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
677 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
678 841
679 $! ? () 842 $! ? ()
680 : $data 843 : $data
681 }
682} 844}
683 845
684sub db_put($$$) { 846sub db_put($$$) {
685 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 876
715 my @data; 877 my @data;
716 my $md5; 878 my $md5;
717 879
718 for (0 .. $#$src) { 880 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 882 }
722 883
723 # if processing is expensive, check 884 # if processing is expensive, check
724 # checksum first 885 # checksum first
725 if (1) { 886 if (1) {
… …
742 903
743 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 905 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
746 907
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 909
749 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
752 913
… …
762 923
763=cut 924=cut
764 925
765sub datalog($@) { 926sub datalog($@) {
766 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 929}
769 930
770=back 931=back
771 932
772=cut 933=cut
… …
967 1128
968 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1131
971 } elsif (ref $type) { 1132 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
973 1134
974 } else { 1135 } else {
975 shift @arg; 1136 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
977 } 1138 }
978 } 1139 }
979} 1140}
980 1141
981sub _object_attach { 1142sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
992 } 1153 }
993 1154
994 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
995 } else { 1156 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1158 }
998 1159
999 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1000} 1161}
1001 1162
… …
1060 1221
1061 for (@$callbacks) { 1222 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1063 1224
1064 if ($@) { 1225 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1227 override;
1068 } 1228 }
1069 1229
1070 return 1 if $override; 1230 return 1 if $override;
1071 } 1231 }
… …
1150 for (@$attach) { 1310 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1153 } 1313 }
1154 } else { 1314 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1316 }
1157 } 1317 }
1158} 1318}
1159 1319
1160cf::attachable->attach ( 1320cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1188 1348
1189 sync_job { 1349 sync_job {
1190 if (length $$rdata) { 1350 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1194 1355
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1221 1382
1222 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1385 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1226 } 1387 }
1227 } else { 1388 } else {
1228 aio_unlink $filename; 1389 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1230 } 1391 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1416 $av = $st->{objs};
1256 } 1417 }
1257 1418
1258 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1261 1423
1262 ($data, $av) 1424 ($data, $av)
1263} 1425}
1264 1426
1265=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1342 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1343 1505
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1507
1346 if (ref $msg) { 1508 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1510
1352 my @reply; 1511 my @reply;
1353 1512
1354 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1355 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1357 1516
1358 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1518 if $reply;
1360 1519
1361 } else { 1520 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1522 }
1364 1523
1365 cf::override; 1524 cf::override;
1366 }, 1525 },
1367); 1526);
… …
1377 }; 1536 };
1378 1537
1379 $grp 1538 $grp
1380} 1539}
1381 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
1382sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1383 cf::sync_job { 1557 cf::sync_job {
1384 my %todo; 1558 my %todo;
1385 1559
1386 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1561 next unless -r $path;
… …
1405 1579
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1582
1409 $ext{source} = 1583 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1412 . $source 1586 . $source
1413 . "\n};\n1"; 1587 . "\n};\n1";
1414 1588
1415 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1602 next ext
1429 unless exists $done{$_}; 1603 unless exists $done{$_};
1430 } 1604 }
1431 1605
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 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
1434 my $active = eval $v->{source}; 1617 my $active = eval $source;
1435 1618
1436 if (length $@) { 1619 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1438 1621
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1624
1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1441 } else { 1627 } else {
1442 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1444 $progress = 1; 1630 $progress = 1;
1445 1631
1446 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1633 unless $active;
1448 } 1634 }
1449 } 1635 }
1450 1636
1451 unless ($progress) { 1637 unless ($progress) {
… …
1453 1639
1454 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1457 } 1643 }
1644
1645 last;
1458 } 1646 }
1459 } 1647 }
1460 }; 1648 };
1461} 1649}
1462 1650
… …
1620 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1621 1809
1622 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1623 $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
1624 1812
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1814 $pl->deactivate;
1815
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1630 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1631 1821
1632 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1688 \@logins 1878 \@logins
1689} 1879}
1690 1880
1691=item $player->maps 1881=item $player->maps
1692 1882
1883=item cf::player::maps $login
1884
1693Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1694player. May block. 1886player. May block.
1695 1887
1696=cut 1888=cut
1697 1889
… …
1759=cut 1951=cut
1760 1952
1761sub find_by_path($) { 1953sub find_by_path($) {
1762 my ($path) = @_; 1954 my ($path) = @_;
1763 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1764 my ($match, $specificity); 1958 my ($match, $specificity);
1765 1959
1766 for my $region (list) { 1960 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1768 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
… …
1796sub generate_random_map { 1990sub generate_random_map {
1797 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1798 1992
1799 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
1800 1994
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 1996}
1816 1997
1817=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1818 1999
1819Register 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
… …
1824 2005
1825sub register { 2006sub register {
1826 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 2008 my $pkg = caller;
1828 2009
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 2011
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 2013}
1834 2014
1835# also paths starting with '/' 2015# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 2017
1838sub thawer_merge { 2018sub thawer_merge {
1839 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1840 2020
1841 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
… …
1846} 2026}
1847 2027
1848sub normalise { 2028sub normalise {
1849 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1850 2030
1851 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1852 2032
1853 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1854 2034
1855 # map plan: 2035 # map plan:
1856 # 2036 #
… …
1871 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 2052 $path = "$base/$path";
1873 } 2053 }
1874 2054
1875 for ($path) { 2055 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1879 } 2058 }
1880 2059
1881 $path 2060 $path
… …
1895 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1896 return $self; 2075 return $self;
1897 } 2076 }
1898 } 2077 }
1899 2078
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 2080 ()
1902} 2081}
1903 2082
2083# may re-bless or do other evil things
1904sub init { 2084sub init {
1905 my ($self) = @_; 2085 my ($self) = @_;
1906 2086
1907 $self 2087 $self
1908} 2088}
… …
1973 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1974 2154
1975 1 2155 1
1976} 2156}
1977 2157
2158# used to laod the header of an original map
1978sub load_header_orig { 2159sub load_header_orig {
1979 my ($self) = @_; 2160 my ($self) = @_;
1980 2161
1981 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1982} 2163}
1983 2164
2165# used to laod the header of an instantiated map
1984sub load_header_temp { 2166sub load_header_temp {
1985 my ($self) = @_; 2167 my ($self) = @_;
1986 2168
1987 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1988} 2170}
1989 2171
2172# called after loading the header from an instantiated map
1990sub prepare_temp { 2173sub prepare_temp {
1991 my ($self) = @_; 2174 my ($self) = @_;
1992 2175
1993 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1995 # safety 2178 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2181}
1999 2182
2183# called after loading the header from an original map
2000sub prepare_orig { 2184sub prepare_orig {
2001 my ($self) = @_; 2185 my ($self) = @_;
2002 2186
2003 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2028 2212
2029sub find; 2213sub find;
2030sub find { 2214sub find {
2031 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2032 2216
2217 cf::cede_to_tick;
2218
2033 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2034 2220
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2223
2038 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2069 2255
2070 { 2256 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2072 2258
2073 return unless $self->valid; 2259 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2261
2078 $self->alloc; 2262 $self->alloc;
2079 2263
2080 $self->pre_load; 2264 $self->pre_load;
2081 cf::cede_to_tick; 2265 cf::cede_to_tick;
2082 2266
2267 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2269 $f->skip_block;
2085 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2086 or return; 2271 or return;
2087 2272
2088 $self->post_load_original 2273 $self->post_load_original
2089 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2090 2275
2091 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2277 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2280 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2098 } 2284 }
2099 } 2285 }
2100 }
2101 2286
2102 $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);
2103 2294
2104 cf::cede_to_tick; 2295 cf::cede_to_tick;
2105 # now do the right thing for maps 2296 # now do the right thing for maps
2106 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2111 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2303 $self->decay_objects;
2113 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2114 $self->update_buttons; 2305 $self->update_buttons;
2115 cf::cede_to_tick; 2306 cf::cede_to_tick;
2116 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2117 } 2308 }
2118 2309
2119 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2312 }
2124 2313
2125 $self->post_load; 2314 $self->post_load;
2315
2316 1
2126} 2317}
2127 2318
2128# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2138# if $self->per_party; 2329# if $self->per_party;
2139 2330
2140 $self 2331 $self
2141} 2332}
2142 2333
2143# find and load all maps in the 3x3 area around a map
2144sub load_neighbours {
2145 my ($map) = @_;
2146
2147 my @neigh; # diagonal neighbours
2148
2149 for (0 .. 3) {
2150 my $neigh = $map->tile_path ($_)
2151 or next;
2152 $neigh = find $neigh, $map
2153 or next;
2154 $neigh->load;
2155
2156 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 }
2160
2161 for (grep defined $_->[0], @neigh) {
2162 my ($path, $origin) = @$_;
2163 my $neigh = find $path, $origin
2164 or next;
2165 $neigh->load;
2166 }
2167}
2168
2169sub find_sync { 2334sub find_sync {
2170 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2171 2336
2172 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
2173} 2342}
2174 2343
2175sub do_load_sync { 2344sub do_load_sync {
2176 my ($map) = @_; 2345 my ($map) = @_;
2177 2346
2347 # it's a bug to call this from the main context
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2180 2350
2181 cf::sync_job { $map->load }; 2351 $map->load;
2182} 2352}
2183 2353
2184our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2186 2356
2187sub find_async { 2357sub find_async {
2188 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2189 2359
2190 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2191 2361
2192 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2194 } 2364 }
2195 2365
2196 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2197 2367
2198 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2257sub swap_out { 2427sub swap_out {
2258 my ($self) = @_; 2428 my ($self) = @_;
2259 2429
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2431
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2263 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2264 return if $self->players; 2434 return if $self->players;
2265 2435
2266 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2267 $self->deactivate; 2437 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2270 2440
2271 # then atomically save 2441 # then atomically save
2272 $self->_save; 2442 $self->_save;
2273 2443
2274 # then free the map 2444 # then free the map
… …
2298 2468
2299 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2300 2470
2301 return if $self->players; 2471 return if $self->players;
2302 2472
2303 warn "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2304 2474
2305 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2306 2476
2307 # need to save uniques path 2477 # need to save uniques path
2308 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2309 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2310 2480
… …
2332 2502
2333 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2334 2504
2335 $self->unlink_save; 2505 $self->unlink_save;
2336 2506
2337 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2338 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2339 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2340 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2341 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342 2512
… …
2572 2742
2573Freezes 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}>).
2574 2744
2575The 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.
2576for 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,
2577though, 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
2578map. 2748map.
2579 2749
2580Will never block. 2750Will never block.
2581 2751
2582=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2603sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2604 my ($self) = @_; 2774 my ($self) = @_;
2605 2775
2606 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2607 2777
2778 ++$self->{_link_recursion};
2779
2608 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2609 2781
2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2612 2784
… …
2638 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2639 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2640 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2641 2813
2642 $map->load; 2814 $map->load;
2643 $map->load_neighbours;
2644 2815
2645 return unless $self->contr->active; 2816 return unless $self->contr->active;
2646 2817
2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2649 2820 # entering was successful
2821 delete $self->{_link_recursion};
2650 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive; 2823 $self->activate_recursive;
2652} 2824 }
2653 2825
2826}
2827
2654=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)]])
2655 2829
2656Moves 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
2657her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2658that 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
2659the 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
… …
2666 2840
2667our $GOTOGEN; 2841our $GOTOGEN;
2668 2842
2669sub cf::object::player::goto { 2843sub cf::object::player::goto {
2670 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 }
2671 2851
2672 # 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
2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674 2854
2675 $self->enter_link; 2855 $self->enter_link;
… …
2695 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2696 } 2876 }
2697 } 2877 }
2698 2878
2699 my $map = eval { 2879 my $map = eval {
2700 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2701 2881
2702 if ($map) { 2882 if ($map) {
2703 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2704 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2705 } else { 2885 } else {
2706 $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);
2707 } 2887 }
2708 2888
2709 $map 2889 $map
… …
2717 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2718 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2719 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2720 } 2900 }
2721 2901
2722 $done->() if $done; 2902 $done->($self) if $done;
2723 })->prio (1); 2903 })->prio (1);
2724} 2904}
2725 2905
2726=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2727 2907
… …
2795 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2796 2976
2797 unless (eval { 2977 unless (eval {
2798 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2799 2979
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2809 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2810 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 }
2811 3006
2812 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2813 3008
2814 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2820 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2821 . "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. "
2822 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2823 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2824 3019
2825 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2826 $self->leave_link; 3021 $self->leave_link;
2827 } 3022 }
2828 })->prio (1); 3023 })->prio (1);
2829} 3024}
2830 3025
… …
3040=cut 3235=cut
3041 3236
3042sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3043 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3044 3239
3045 if ($self->extcmd == 2) {
3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3047 } elsif ($self->extcmd == 1) { # TODO: remove
3048 push @msg, msgtype => "event_$type";
3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3050 }
3051} 3241}
3052 3242
3053=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3054 3244
3055Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3057=cut 3247=cut
3058 3248
3059sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3060 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3061 3251
3062 if ($self->extcmd == 2) {
3063 $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]));
3064 } elsif ($self->extcmd == 1) {
3065 #TODO: version 1, remove
3066 unshift @msg, msgtype => "reply", msgid => $id;
3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3068 }
3069} 3253}
3070 3254
3071=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3072 3256
3073Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3128 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3129 3313
3130 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3131 3315
3132 if (ref $msg) { 3316 if (ref $msg) {
3133 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3134 "ARRAY" eq ref $msg
3135 ? @$msg
3136 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3137 3318
3138 my @reply; 3319 my @reply;
3139 3320
3140 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3141 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3143 3324
3144 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3145 if $reply; 3326 if $reply;
3146 3327
3147 } else { 3328 } else {
3148 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";
3149 } 3330 }
3150 3331
3151 cf::override; 3332 cf::override;
3152 }, 3333 },
3153); 3334);
… …
3234 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3235 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3236 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3237 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3238) { 3419) {
3239 no strict 'refs';
3240 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242 for @funs; 3422 for @funs;
3243} 3423}
3244 3424
… …
3283 local @cf::_safe_eval_args = values %vars; 3463 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval; 3464 @res = wantarray ? eval eval : scalar eval $eval;
3285 } 3465 }
3286 3466
3287 if ($@) { 3467 if ($@) {
3288 warn "$@"; 3468 warn "$@",
3289 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3290 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3291 } 3471 }
3292 3472
3293 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3294} 3474}
3295 3475
… …
3320=cut 3500=cut
3321 3501
3322############################################################################# 3502#############################################################################
3323# the server's init and main functions 3503# the server's init and main functions
3324 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
3325sub load_facedata($) { 3529sub load_facedata($) {
3326 my ($path) = @_; 3530 my ($path) = @_;
3327 3531
3328 # 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
3329 # for this (global event?) 3533 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3331 3535
3332 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333 3537
3334 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3335 3539
3336 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3337 0 < aio_load $path, $facedata
3338 or die "$path: $!";
3339
3340 $facedata = Coro::Storable::thaw $facedata;
3341 3541
3342 $facedata->{version} == 2 3542 $facedata->{version} == 2
3343 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3344 3544
3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3347 $facedata->{resource}{"res/exp_table"} = {
3348 type => FT_RSRC,
3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3351 };
3352 cf::cede_to_tick; 3545 cf::cede_to_tick;
3353 3546
3354 { 3547 {
3355 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3356 3549
3357 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3358 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359 3553
3360 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3361 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3363 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#
3364 3560
3365 cf::cede_to_tick; 3561 cf::cede_to_tick;
3366 } 3562 }
3367 3563
3368 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3373 3569
3374 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3375 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377 } else { 3573 } else {
3378 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3379 } 3575 }
3380 3576
3381 cf::cede_to_tick; 3577 cf::cede_to_tick;
3382 } 3578 }
3383 } 3579 }
… …
3395 3591
3396 { 3592 {
3397 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3398 3594
3399 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3400 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
3401 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402 3599
3600 cf::face::set_type $idx, $type;
3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404 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#
3405 } else { 3604 } else {
3406 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3407 } 3606 }
3408 3607
3409 cf::cede_to_tick; 3608 cf::cede_to_tick;
3410 } 3609 }
3411 } 3610 }
3412 3611
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414 3613
3415 1 3614 1
3416} 3615}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3437 3616
3438register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3439 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3440 3619
3441 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
… …
3449 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3451 cf::arch::commit_load; 3630 cf::arch::commit_load;
3452 3631
3453 $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;
3454} 3646}
3455 3647
3456sub reload_regions { 3648sub reload_regions {
3457 # 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
3458 # for this (global event?) 3650 # for this (global event?)
… …
3473} 3665}
3474 3666
3475sub reload_archetypes { 3667sub reload_archetypes {
3476 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3477 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 );
3478} 3679}
3479 3680
3480sub reload_treasures { 3681sub reload_treasures {
3481 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3482 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3483} 3684}
3484 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
3485sub reload_resources { 3761sub reload_resources {
3486 warn "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3487 3763
3764 reload_materials;
3488 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3767 reload_sound;
3489 reload_archetypes; 3768 reload_archetypes;
3490 reload_regions; 3769 reload_regions;
3491 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3492 3772
3493 warn "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3494} 3774}
3495 3775
3496sub reload_config { 3776sub reload_config {
3497 warn "reloading config file...\n"; 3777 trace "reloading config file...\n";
3498 3778
3499 open my $fh, "<:utf8", "$CONFDIR/config" 3779 my $config = load_file "$CONFDIR/config";
3500 or return; 3780 utf8::decode $config;
3781 *CFG = decode_yaml $config;
3501 3782
3502 local $/;
3503 *CFG = YAML::XS::Load scalar <$fh>;
3504
3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506 3784
3507 $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};
3508 $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};
3509 3787
3510 if (exists $CFG{mlockall}) { 3788 if (exists $CFG{mlockall}) {
… …
3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3790 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513 and die "WARNING: m(un)lockall failed: $!\n"; 3791 and die "WARNING: m(un)lockall failed: $!\n";
3514 }; 3792 };
3515 warn $@ if $@; 3793 warn $@ if $@;
3516 } 3794 }
3517
3518 warn "finished reloading resource files\n";
3519} 3795}
3520 3796
3521sub pidfile() { 3797sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3798 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!"; 3799 or die "$PIDFILE: $!";
… …
3536 seek $fh, 0, 0; 3812 seek $fh, 0, 0;
3537 print $fh $$; 3813 print $fh $$;
3538} 3814}
3539 3815
3540sub main_loop { 3816sub main_loop {
3541 warn "EV::loop starting\n"; 3817 trace "EV::loop starting\n";
3542 if (1) { 3818 if (1) {
3543 EV::loop; 3819 EV::loop;
3544 } 3820 }
3545 warn "EV::loop returned\n"; 3821 trace "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP; 3822 goto &main_loop unless $REALLY_UNLOOP;
3547} 3823}
3548 3824
3549sub main { 3825sub main {
3550 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3551 3827
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 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.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556 3832
3557 $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
3558 3834
3559 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3560 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3561 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#
3562 (async { 3838 (async {
3563 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3564 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3565 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
3566 }; 3842 };
3567 3843
3568 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3569 3845
3570 cf::sync_job { 3846 cf::sync_job {
3571 cf::init_experience; 3847 cf::incloader::init ();
3848
3849 db_init;
3850
3572 cf::init_anim; 3851 cf::init_anim;
3573 cf::init_attackmess; 3852 cf::init_attackmess;
3574 cf::init_dynamic; 3853 cf::init_dynamic;
3575 3854
3576 cf::load_settings; 3855 cf::load_settings;
3577 cf::load_materials;
3578 3856
3579 reload_resources; 3857 reload_resources;
3580 reload_config; 3858 reload_config;
3581 db_init;
3582 3859
3583 cf::init_uuid; 3860 cf::init_uuid;
3584 cf::init_signals; 3861 cf::init_signals;
3585 cf::init_skills; 3862 cf::init_skills;
3586 3863
… …
3594 3871
3595 # no (long-running) fork's whatsoever before this point(!) 3872 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX (); 3873 use POSIX ();
3597 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};
3598 3875
3599 (pop @POST_INIT)->(0) while @POST_INIT; 3876 cf::_post_init 0;
3600 }; 3877 };
3601 3878
3602 cf::object::thawer::errors_are_fatal 0; 3879 cf::object::thawer::errors_are_fatal 0;
3603 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";
3604 3881
3882 AE::postpone {
3883 undef &main; # free gobs of memory :)
3884 };
3885
3605 main_loop; 3886 goto &main_loop;
3606} 3887}
3607 3888
3608############################################################################# 3889#############################################################################
3609# initialisation and cleanup 3890# initialisation and cleanup
3610 3891
… …
3649 or return; 3930 or return;
3650 3931
3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3932 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652 and return; 3933 and return;
3653 3934
3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3935 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655 3936
3656 1 3937 1
3657} 3938}
3658 3939
3659our $uuid_lock; 3940our $uuid_lock;
… …
3671 or return; 3952 or return;
3672 3953
3673 my $value = uuid_seq uuid_cur; 3954 my $value = uuid_seq uuid_cur;
3674 3955
3675 unless ($value) { 3956 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n"; 3957 info "cowardly refusing to write zero uuid value!\n";
3677 return; 3958 return;
3678 } 3959 }
3679 3960
3680 my $value = uuid_str $value + $uuid_skip; 3961 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0; 3962 $uuid_skip = 0;
… …
3691 or return; 3972 or return;
3692 3973
3693 aio_rename "$uuid~", $uuid 3974 aio_rename "$uuid~", $uuid
3694 and return; 3975 and return;
3695 3976
3696 warn "uuid file written ($value).\n"; 3977 trace "uuid file written ($value).\n";
3697 3978
3698 1 3979 1
3699 3980
3700} 3981}
3701 3982
… …
3707} 3988}
3708 3989
3709sub emergency_save() { 3990sub emergency_save() {
3710 my $freeze_guard = cf::freeze_mainloop; 3991 my $freeze_guard = cf::freeze_mainloop;
3711 3992
3712 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;
3713 3999
3714 cf::sync_job { 4000 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so 4001 cf::write_runtime_sync; # external watchdog should not bark
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719 4002
3720 # use a peculiar iteration method to avoid tripping on perl 4003 # use a peculiar iteration method to avoid tripping on perl
3721 # refcount bugs in for. also avoids problems with players 4004 # refcount bugs in for. also avoids problems with players
3722 # and maps saved/destroyed asynchronously. 4005 # and maps saved/destroyed asynchronously.
3723 warn "emergency_perl_save: begin player save\n"; 4006 info "emergency_perl_save: begin player save\n";
3724 for my $login (keys %cf::PLAYER) { 4007 for my $login (keys %cf::PLAYER) {
3725 my $pl = $cf::PLAYER{$login} or next; 4008 my $pl = $cf::PLAYER{$login} or next;
3726 $pl->valid or next; 4009 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4010 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728 $pl->save; 4011 $pl->save;
3729 } 4012 }
3730 warn "emergency_perl_save: end player save\n"; 4013 info "emergency_perl_save: end player save\n";
3731 4014
4015 cf::write_runtime_sync; # external watchdog should not bark
4016
3732 warn "emergency_perl_save: begin map save\n"; 4017 info "emergency_perl_save: begin map save\n";
3733 for my $path (keys %cf::MAP) { 4018 for my $path (keys %cf::MAP) {
3734 my $map = $cf::MAP{$path} or next; 4019 my $map = $cf::MAP{$path} or next;
3735 $map->valid or next; 4020 $map->valid or next;
3736 $map->save; 4021 $map->save;
3737 } 4022 }
3738 warn "emergency_perl_save: end map save\n"; 4023 info "emergency_perl_save: end map save\n";
3739 4024
4025 cf::write_runtime_sync; # external watchdog should not bark
4026
3740 warn "emergency_perl_save: begin database checkpoint\n"; 4027 info "emergency_perl_save: begin database checkpoint\n";
3741 BDB::db_env_txn_checkpoint $DB_ENV; 4028 BDB::db_env_txn_checkpoint $DB_ENV;
3742 warn "emergency_perl_save: end database checkpoint\n"; 4029 info "emergency_perl_save: end database checkpoint\n";
3743 4030
3744 warn "emergency_perl_save: begin write uuid\n"; 4031 info "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1; 4032 write_uuid_sync 1;
3746 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
3747 }; 4053 };
3748 4054
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3754 warn "emergency_perl_save: leave\n"; 4055 info "emergency_perl_save: leave\n";
3755} 4056}
3756 4057
3757sub post_cleanup { 4058sub post_cleanup {
3758 my ($make_core) = @_; 4059 my ($make_core) = @_;
3759 4060
4061 IO::AIO::flush;
4062
3760 warn Carp::longmess "post_cleanup backtrace" 4063 error Carp::longmess "post_cleanup backtrace"
3761 if $make_core; 4064 if $make_core;
3762 4065
3763 my $fh = pidfile; 4066 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$; 4067 unlink $PIDFILE if <$fh> == $$;
3765} 4068}
… …
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4088 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) { 4089 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"}; 4090 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4091# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 } 4092 }
3790 warn "cleared package $pkg\n";#d#
3791} 4093}
3792 4094
3793sub do_reload_perl() { 4095sub do_reload_perl() {
3794 # can/must only be called in main 4096 # can/must only be called in main
3795 if ($Coro::current != $Coro::main) { 4097 unless (in_main) {
3796 warn "can only reload from main coroutine"; 4098 error "can only reload from main coroutine";
3797 return; 4099 return;
3798 } 4100 }
3799 4101
3800 return if $RELOAD++; 4102 return if $RELOAD++;
3801 4103
3802 my $t1 = AE::time; 4104 my $t1 = AE::time;
3803 4105
3804 while ($RELOAD) { 4106 while ($RELOAD) {
3805 warn "reloading..."; 4107 cf::get_slot 0.1, -1, "reload_perl";
4108 info "perl_reload: reloading...";
3806 4109
3807 warn "entering sync_job"; 4110 trace "perl_reload: entering sync_job";
3808 4111
3809 cf::sync_job { 4112 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811 cf::emergency_save; 4113 #cf::emergency_save;
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 4114
3814 warn "syncing database to disk";
3815 BDB::db_env_txn_checkpoint $DB_ENV;
3816
3817 # if anything goes wrong in here, we should simply crash as we already saved
3818
3819 warn "flushing outstanding aio requests";
3820 while (IO::AIO::nreqs || BDB::nreqs) {
3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822 }
3823
3824 warn "cancelling all extension coros"; 4115 trace "perl_reload: cancelling all extension coros";
3825 $_->cancel for values %EXT_CORO; 4116 $_->cancel for values %EXT_CORO;
3826 %EXT_CORO = (); 4117 %EXT_CORO = ();
3827 4118
3828 warn "removing commands"; 4119 trace "perl_reload: removing commands";
3829 %COMMAND = (); 4120 %COMMAND = ();
3830 4121
3831 warn "removing ext/exti commands"; 4122 trace "perl_reload: removing ext/exti commands";
3832 %EXTCMD = (); 4123 %EXTCMD = ();
3833 %EXTICMD = (); 4124 %EXTICMD = ();
3834 4125
3835 warn "unloading/nuking all extensions"; 4126 trace "perl_reload: unloading/nuking all extensions";
3836 for my $pkg (@EXTS) { 4127 for my $pkg (@EXTS) {
3837 warn "... unloading $pkg"; 4128 trace "... unloading $pkg";
3838 4129
3839 if (my $cb = $pkg->can ("unload")) { 4130 if (my $cb = $pkg->can ("unload")) {
3840 eval { 4131 eval {
3841 $cb->($pkg); 4132 $cb->($pkg);
3842 1 4133 1
3843 } or warn "$pkg unloaded, but with errors: $@"; 4134 } or error "$pkg unloaded, but with errors: $@";
3844 } 4135 }
3845 4136
3846 warn "... clearing $pkg"; 4137 trace "... clearing $pkg";
3847 clear_package $pkg; 4138 clear_package $pkg;
3848 } 4139 }
3849 4140
3850 warn "unloading all perl modules loaded from $LIBDIR"; 4141 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) { 4142 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4143 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853 4144
3854 warn "... unloading $k"; 4145 trace "... unloading $k";
3855 delete $INC{$k}; 4146 delete $INC{$k};
3856 4147
3857 $k =~ s/\.pm$//; 4148 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g; 4149 $k =~ s/\//::/g;
3859 4150
… …
3862 } 4153 }
3863 4154
3864 clear_package $k; 4155 clear_package $k;
3865 } 4156 }
3866 4157
3867 warn "getting rid of safe::, as good as possible"; 4158 trace "perl_reload: getting rid of safe::, as good as possible";
3868 clear_package "safe::$_" 4159 clear_package "safe::$_"
3869 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);
3870 4161
3871 warn "unloading cf.pm \"a bit\""; 4162 trace "perl_reload: unloading cf.pm \"a bit\"";
3872 delete $INC{"cf.pm"}; 4163 delete $INC{"cf.pm"};
3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4164 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874 4165
3875 # don't, removes xs symbols, too, 4166 # don't, removes xs symbols, too,
3876 # and global variables created in xs 4167 # and global variables created in xs
3877 #clear_package __PACKAGE__; 4168 #clear_package __PACKAGE__;
3878 4169
3879 warn "unload completed, starting to reload now"; 4170 info "perl_reload: unload completed, starting to reload now";
3880 4171
3881 warn "reloading cf.pm"; 4172 trace "perl_reload: reloading cf.pm";
3882 require cf; 4173 require cf;
3883 cf::_connect_to_perl_1; 4174 cf::_connect_to_perl_1;
3884 4175
3885 warn "loading config and database again"; 4176 trace "perl_reload: loading config and database again";
3886 cf::reload_config; 4177 cf::reload_config;
3887 4178
3888 warn "loading extensions"; 4179 trace "perl_reload: loading extensions";
3889 cf::load_extensions; 4180 cf::load_extensions;
3890 4181
3891 if ($REATTACH_ON_RELOAD) { 4182 if ($REATTACH_ON_RELOAD) {
3892 warn "reattaching attachments to objects/players"; 4183 trace "perl_reload: reattaching attachments to objects/players";
3893 _global_reattach; # objects, sockets 4184 _global_reattach; # objects, sockets
3894 warn "reattaching attachments to maps"; 4185 trace "perl_reload: reattaching attachments to maps";
3895 reattach $_ for values %MAP; 4186 reattach $_ for values %MAP;
3896 warn "reattaching attachments to players"; 4187 trace "perl_reload: reattaching attachments to players";
3897 reattach $_ for values %PLAYER; 4188 reattach $_ for values %PLAYER;
3898 } 4189 }
3899 4190
3900 warn "running post_init jobs"; 4191 cf::_post_init 1;
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902 4192
3903 warn "leaving sync_job"; 4193 trace "perl_reload: leaving sync_job";
3904 4194
3905 1 4195 1
3906 } or do { 4196 } or do {
3907 warn $@; 4197 error $@;
3908 cf::cleanup "error while reloading, exiting."; 4198 cf::cleanup "perl_reload: error, exiting.";
3909 }; 4199 };
3910 4200
3911 warn "reloaded";
3912 --$RELOAD; 4201 --$RELOAD;
3913 } 4202 }
3914 4203
3915 $t1 = AE::time - $t1; 4204 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n"; 4205 info "perl_reload: completed in ${t1}s\n";
3917}; 4206};
3918 4207
3919our $RELOAD_WATCHER; # used only during reload 4208our $RELOAD_WATCHER; # used only during reload
3920 4209
3921sub reload_perl() { 4210sub reload_perl() {
… …
3942 reload_perl; 4231 reload_perl;
3943 }; 4232 };
3944 } 4233 }
3945}; 4234};
3946 4235
3947unshift @INC, $LIBDIR; 4236#############################################################################
3948 4237
3949my $bug_warning = 0; 4238my $bug_warning = 0;
3950 4239
3951our @WAIT_FOR_TICK;
3952our @WAIT_FOR_TICK_BEGIN;
3953
3954sub wait_for_tick { 4240sub wait_for_tick() {
3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3956 4242
3957 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
3958 push @WAIT_FOR_TICK, $signal;
3959 $signal->wait;
3960} 4244}
3961 4245
3962sub wait_for_tick_begin { 4246sub wait_for_tick_begin() {
3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3964 4248
3965 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
3966 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
3967 $signal->wait; 4251 $signal->wait;
3968} 4252}
… …
3972 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"
3973 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
3974 return; 4258 return;
3975 } 4259 }
3976 4260
3977 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
3978 4262
3979 #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#
3980 4264
3981 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982 $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.;
3983 Coro::async_pool { 4267 Coro::async_pool {
3984 $Coro::current->{desc} = "runtime saver"; 4268 $Coro::current->{desc} = "runtime saver";
3985 write_runtime_sync 4269 write_runtime_sync
3986 or warn "ERROR: unable to write runtime file: $!"; 4270 or error "ERROR: unable to write runtime file: $!";
3987 }; 4271 };
3988 } 4272 }
3989 4273
3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991 $sig->send; 4275 $sig->send;
3992 } 4276 }
3993 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
3994 $sig->send;
3995 }
3996 4278
3997 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
3998 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3999 4281
4000 if (0) { 4282 if (0) {
4001 if ($NEXT_TICK) { 4283 if ($NEXT_TICK) {
4002 my $jitter = $TICK_START - $NEXT_TICK; 4284 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4285 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d# 4286 debug "jitter $JITTER\n";#d#
4005 } 4287 }
4006 } 4288 }
4007} 4289}
4008 4290
4009{ 4291{
4010 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4011 4294
4012 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4013 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4014 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4015 4298
4016 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
4017 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4019 $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;
… …
4044 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4045 }; 4328 };
4046 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4047 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4048 }; 4331 };
4332
4333 info "database initialised";
4049} 4334}
4050 4335
4051{ 4336{
4052 # configure IO::AIO 4337 # configure IO::AIO
4053 4338
4339 info "initialising aio";
4054 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4055 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4056 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4057} 4344}
4058 4345
4059my $_log_backtrace; 4346our $_log_backtrace;
4347our $_log_backtrace_last;
4060 4348
4061sub _log_backtrace { 4349sub _log_backtrace {
4062 my ($msg, @addr) = @_; 4350 my ($msg, @addr) = @_;
4063 4351
4064 $msg =~ s/\n//; 4352 $msg =~ s/\n$//;
4065 4353
4354 if ($_log_backtrace_last eq $msg) {
4355 LOG llevInfo, "[ABT] $msg\n";
4356 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4066 # limit the # of concurrent backtraces 4357 # limit the # of concurrent backtraces
4067 if ($_log_backtrace < 2) { 4358 } elsif ($_log_backtrace < 2) {
4359 $_log_backtrace_last = $msg;
4068 ++$_log_backtrace; 4360 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg; 4361 my $perl_bt = Carp::longmess $msg;
4070 async { 4362 async {
4071 $Coro::current->{desc} = "abt $msg"; 4363 $Coro::current->{desc} = "abt $msg";
4072 4364
… …
4092 LOG llevInfo, "[ABT] $_\n" for @bt; 4384 LOG llevInfo, "[ABT] $_\n" for @bt;
4093 --$_log_backtrace; 4385 --$_log_backtrace;
4094 }; 4386 };
4095 } else { 4387 } else {
4096 LOG llevInfo, "[ABT] $msg\n"; 4388 LOG llevInfo, "[ABT] $msg\n";
4097 LOG llevInfo, "[ABT] [suppressed]\n"; 4389 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4098 } 4390 }
4099} 4391}
4100 4392
4101# load additional modules 4393# load additional modules
4102require "cf/$_.pm" for @EXTRA_MODULES; 4394require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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