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.515 by root, Thu Apr 15 04:56:47 2010 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 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 {
2212 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2213 2383
2214 () 2384 ()
2215} 2385}
2216 2386
2387# common code, used by both ->save and ->swapout
2217sub save { 2388sub _save {
2218 my ($self) = @_; 2389 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2390
2222 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2223 2392
2224 return unless $self->dirty; 2393 return unless $self->dirty;
2225 2394
2245 } else { 2414 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2416 }
2248} 2417}
2249 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2250sub swap_out { 2427sub swap_out {
2251 my ($self) = @_; 2428 my ($self) = @_;
2252 2429
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2258 return if $self->players; 2434 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2260 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2261 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2262 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2263 2486
2264 $self->deactivate; 2487 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2489 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2490
2312 $self->unlink_save; 2491 $self->unlink_save;
2313 $self->destroy; 2492 $self->destroy;
2314} 2493}
2315 2494
2323 2502
2324 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2325 2504
2326 $self->unlink_save; 2505 $self->unlink_save;
2327 2506
2328 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2512
2563 2742
2564Freezes 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}>).
2565 2744
2566The 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.
2567for 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,
2568though, 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
2569map. 2748map.
2570 2749
2571Will never block. 2750Will never block.
2572 2751
2573=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2594sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2595 my ($self) = @_; 2774 my ($self) = @_;
2596 2775
2597 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2598 2777
2778 ++$self->{_link_recursion};
2779
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2781
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2603 2784
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2786}
2606 2787
2607sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2609 2790
2629 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2630 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2631 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2632 2813
2633 $map->load; 2814 $map->load;
2634 $map->load_neighbours;
2635 2815
2636 return unless $self->contr->active; 2816 return unless $self->contr->active;
2637 2817
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2640 2820 # entering was successful
2821 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2823 $self->activate_recursive;
2643} 2824 }
2644 2825
2826}
2827
2645=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)]])
2646 2829
2647Moves 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
2648her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2649that 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
2650the 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
2657 2840
2658our $GOTOGEN; 2841our $GOTOGEN;
2659 2842
2660sub cf::object::player::goto { 2843sub cf::object::player::goto {
2661 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 }
2662 2851
2663 # 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
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2854
2666 $self->enter_link; 2855 $self->enter_link;
2686 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2687 } 2876 }
2688 } 2877 }
2689 2878
2690 my $map = eval { 2879 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692 2881
2693 if ($map) { 2882 if ($map) {
2694 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2885 } else {
2697 $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);
2698 } 2887 }
2699 2888
2700 $map 2889 $map
2708 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2711 } 2900 }
2712 2901
2713 $done->() if $done; 2902 $done->($self) if $done;
2714 })->prio (1); 2903 })->prio (1);
2715} 2904}
2716 2905
2717=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2718 2907
2786 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2787 2976
2788 unless (eval { 2977 unless (eval {
2789 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2790 2979
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2800 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2801 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 }
2802 3006
2803 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2804 3008
2805 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2811 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "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. "
2813 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2815 3019
2816 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 3021 $self->leave_link;
2818 } 3022 }
2819 })->prio (1); 3023 })->prio (1);
2820} 3024}
2821 3025
3031=cut 3235=cut
3032 3236
3033sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3034 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3035 3239
3036 if ($self->extcmd == 2) {
3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3038 } elsif ($self->extcmd == 1) { # TODO: remove
3039 push @msg, msgtype => "event_$type";
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3041 }
3042} 3241}
3043 3242
3044=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3045 3244
3046Sends an ext reply to the client. 3245Sends an ext reply to the client.
3048=cut 3247=cut
3049 3248
3050sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3051 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3052 3251
3053 if ($self->extcmd == 2) {
3054 $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]));
3055 } elsif ($self->extcmd == 1) {
3056 #TODO: version 1, remove
3057 unshift @msg, msgtype => "reply", msgid => $id;
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3059 }
3060} 3253}
3061 3254
3062=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3063 3256
3064Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
3119 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3120 3313
3121 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3122 3315
3123 if (ref $msg) { 3316 if (ref $msg) {
3124 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3125 "ARRAY" eq ref $msg
3126 ? @$msg
3127 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3128 3318
3129 my @reply; 3319 my @reply;
3130 3320
3131 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3132 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3134 3324
3135 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3326 if $reply;
3137 3327
3138 } else { 3328 } else {
3139 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";
3140 } 3330 }
3141 3331
3142 cf::override; 3332 cf::override;
3143 }, 3333 },
3144); 3334);
3225 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3229) { 3419) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3422 for @funs;
3234} 3423}
3235 3424
3274 local @cf::_safe_eval_args = values %vars; 3463 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3464 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3465 }
3277 3466
3278 if ($@) { 3467 if ($@) {
3279 warn "$@"; 3468 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3282 } 3471 }
3283 3472
3284 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3285} 3474}
3286 3475
3311=cut 3500=cut
3312 3501
3313############################################################################# 3502#############################################################################
3314# the server's init and main functions 3503# the server's init and main functions
3315 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
3316sub load_facedata($) { 3529sub load_facedata($) {
3317 my ($path) = @_; 3530 my ($path) = @_;
3318 3531
3319 # 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
3320 # for this (global event?) 3533 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3535
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3537
3325 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3326 3539
3327 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3328 0 < aio_load $path, $facedata
3329 or die "$path: $!";
3330
3331 $facedata = Coro::Storable::thaw $facedata;
3332 3541
3333 $facedata->{version} == 2 3542 $facedata->{version} == 2
3334 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3335 3544
3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3338 $facedata->{resource}{"res/exp_table"} = {
3339 type => FT_RSRC,
3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3342 };
3343 cf::cede_to_tick; 3545 cf::cede_to_tick;
3344 3546
3345 { 3547 {
3346 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3347 3549
3348 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3349 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350 3553
3351 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354 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#
3355 3560
3356 cf::cede_to_tick; 3561 cf::cede_to_tick;
3357 } 3562 }
3358 3563
3359 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3364 3569
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3573 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3575 }
3371 3576
3372 cf::cede_to_tick; 3577 cf::cede_to_tick;
3373 } 3578 }
3374 } 3579 }
3386 3591
3387 { 3592 {
3388 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3389 3594
3390 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3391 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
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3599
3600 cf::face::set_type $idx, $type;
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 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#
3396 } else { 3604 } else {
3397 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3398 } 3606 }
3399 3607
3400 cf::cede_to_tick; 3608 cf::cede_to_tick;
3401 } 3609 }
3402 } 3610 }
3403 3611
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3613
3406 1 3614 1
3407} 3615}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3616
3429register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3431 3619
3432 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3440 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3442 cf::arch::commit_load; 3630 cf::arch::commit_load;
3443 3631
3444 $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;
3445} 3646}
3446 3647
3447sub reload_regions { 3648sub reload_regions {
3448 # 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
3449 # for this (global event?) 3650 # for this (global event?)
3464} 3665}
3465 3666
3466sub reload_archetypes { 3667sub reload_archetypes {
3467 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3468 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 );
3469} 3679}
3470 3680
3471sub reload_treasures { 3681sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3474} 3684}
3475 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
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3476sub reload_resources { 3768sub reload_resources {
3477 warn "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3478 3770
3771 reload_materials;
3479 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3774 reload_sound;
3480 reload_archetypes; 3775 reload_archetypes;
3481 reload_regions; 3776 reload_regions;
3482 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3483 3779
3484 warn "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3485} 3781}
3486 3782
3487sub reload_config { 3783sub reload_config {
3488 warn "reloading config file...\n"; 3784 trace "reloading config file...\n";
3489 3785
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3786 my $config = load_file "$CONFDIR/config";
3491 or return; 3787 utf8::decode $config;
3788 *CFG = decode_yaml $config;
3492 3789
3493 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>;
3495
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3790 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3791
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3792 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3793 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3794
3501 if (exists $CFG{mlockall}) { 3795 if (exists $CFG{mlockall}) {
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3797 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3798 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3799 };
3506 warn $@ if $@; 3800 warn $@ if $@;
3507 } 3801 }
3508
3509 warn "finished reloading resource files\n";
3510} 3802}
3511 3803
3512sub pidfile() { 3804sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3805 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3806 or die "$PIDFILE: $!";
3527 seek $fh, 0, 0; 3819 seek $fh, 0, 0;
3528 print $fh $$; 3820 print $fh $$;
3529} 3821}
3530 3822
3531sub main_loop { 3823sub main_loop {
3532 warn "EV::loop starting\n"; 3824 trace "EV::loop starting\n";
3533 if (1) { 3825 if (1) {
3534 EV::loop; 3826 EV::loop;
3535 } 3827 }
3536 warn "EV::loop returned\n"; 3828 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3829 goto &main_loop unless $REALLY_UNLOOP;
3538} 3830}
3539 3831
3540sub main { 3832sub main {
3541 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3542 3834
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547 3839
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549 3841
3550 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3551 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3553 (async { 3845 (async {
3554 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3556 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
3557 }; 3849 };
3558 3850
3559 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3560 3852
3561 cf::sync_job { 3853 cf::sync_job {
3562 cf::init_experience; 3854 cf::incloader::init ();
3855
3856 db_init;
3857
3563 cf::init_anim; 3858 cf::init_anim;
3564 cf::init_attackmess; 3859 cf::init_attackmess;
3565 cf::init_dynamic; 3860 cf::init_dynamic;
3566 3861
3567 cf::load_settings; 3862 cf::load_settings;
3568 cf::load_materials;
3569 3863
3570 reload_resources; 3864 reload_resources;
3571 reload_config; 3865 reload_config;
3572 db_init;
3573 3866
3574 cf::init_uuid; 3867 cf::init_uuid;
3575 cf::init_signals; 3868 cf::init_signals;
3576 cf::init_skills; 3869 cf::init_skills;
3577 3870
3585 3878
3586 # no (long-running) fork's whatsoever before this point(!) 3879 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3880 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3881 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3882
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3883 cf::_post_init 0;
3591 }; 3884 };
3592 3885
3886 cf::object::thawer::errors_are_fatal 0;
3887 info "parse errors in files are no longer fatal from this point on.\n";
3888
3889 AE::postpone {
3890 undef &main; # free gobs of memory :)
3891 };
3892
3593 main_loop; 3893 goto &main_loop;
3594} 3894}
3595 3895
3596############################################################################# 3896#############################################################################
3597# initialisation and cleanup 3897# initialisation and cleanup
3598 3898
3637 or return; 3937 or return;
3638 3938
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3939 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3940 and return;
3641 3941
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3942 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3943
3644 1 3944 1
3645} 3945}
3646 3946
3647our $uuid_lock; 3947our $uuid_lock;
3659 or return; 3959 or return;
3660 3960
3661 my $value = uuid_seq uuid_cur; 3961 my $value = uuid_seq uuid_cur;
3662 3962
3663 unless ($value) { 3963 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3964 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3965 return;
3666 } 3966 }
3667 3967
3668 my $value = uuid_str $value + $uuid_skip; 3968 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3969 $uuid_skip = 0;
3679 or return; 3979 or return;
3680 3980
3681 aio_rename "$uuid~", $uuid 3981 aio_rename "$uuid~", $uuid
3682 and return; 3982 and return;
3683 3983
3684 warn "uuid file written ($value).\n"; 3984 trace "uuid file written ($value).\n";
3685 3985
3686 1 3986 1
3687 3987
3688} 3988}
3689 3989
3695} 3995}
3696 3996
3697sub emergency_save() { 3997sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3998 my $freeze_guard = cf::freeze_mainloop;
3699 3999
3700 warn "emergency_perl_save: enter\n"; 4000 info "emergency_perl_save: enter\n";
4001
4002 # this is a trade-off: we want to be very quick here, so
4003 # save all maps without fsync, and later call a global sync
4004 # (which in turn might be very very slow)
4005 local $USE_FSYNC = 0;
3701 4006
3702 cf::sync_job { 4007 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 4008 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 4009
3708 # use a peculiar iteration method to avoid tripping on perl 4010 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 4011 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 4012 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 4013 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 4014 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 4015 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 4016 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4017 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 4018 $pl->save;
3717 } 4019 }
3718 warn "emergency_perl_save: end player save\n"; 4020 info "emergency_perl_save: end player save\n";
3719 4021
4022 cf::write_runtime_sync; # external watchdog should not bark
4023
3720 warn "emergency_perl_save: begin map save\n"; 4024 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 4025 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 4026 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 4027 $map->valid or next;
3724 $map->save; 4028 $map->save;
3725 } 4029 }
3726 warn "emergency_perl_save: end map save\n"; 4030 info "emergency_perl_save: end map save\n";
3727 4031
4032 cf::write_runtime_sync; # external watchdog should not bark
4033
3728 warn "emergency_perl_save: begin database checkpoint\n"; 4034 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 4035 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 4036 info "emergency_perl_save: end database checkpoint\n";
3731 4037
3732 warn "emergency_perl_save: begin write uuid\n"; 4038 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 4039 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n"; 4040 info "emergency_perl_save: end write uuid\n";
4041
4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 trace "emergency_perl_save: syncing database to disk";
4045 BDB::db_env_txn_checkpoint $DB_ENV;
4046
4047 info "emergency_perl_save: starting sync\n";
4048 IO::AIO::aio_sync sub {
4049 info "emergency_perl_save: finished sync\n";
4050 };
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 trace "emergency_perl_save: flushing outstanding aio requests";
4055 while (IO::AIO::nreqs || BDB::nreqs) {
4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4057 }
4058
4059 cf::write_runtime_sync; # external watchdog should not bark
3735 }; 4060 };
3736 4061
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 4062 info "emergency_perl_save: leave\n";
3743} 4063}
3744 4064
3745sub post_cleanup { 4065sub post_cleanup {
3746 my ($make_core) = @_; 4066 my ($make_core) = @_;
3747 4067
4068 IO::AIO::flush;
4069
3748 warn Carp::longmess "post_cleanup backtrace" 4070 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 4071 if $make_core;
3750 4072
3751 my $fh = pidfile; 4073 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 4074 unlink $PIDFILE if <$fh> == $$;
3753} 4075}
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4095 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 4096 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 4097 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4098# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 4099 }
3778 warn "cleared package $pkg\n";#d#
3779} 4100}
3780 4101
3781sub do_reload_perl() { 4102sub do_reload_perl() {
3782 # can/must only be called in main 4103 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 4104 unless (in_main) {
3784 warn "can only reload from main coroutine"; 4105 error "can only reload from main coroutine";
3785 return; 4106 return;
3786 } 4107 }
3787 4108
3788 return if $RELOAD++; 4109 return if $RELOAD++;
3789 4110
3790 my $t1 = AE::time; 4111 my $t1 = AE::time;
3791 4112
3792 while ($RELOAD) { 4113 while ($RELOAD) {
3793 warn "reloading..."; 4114 cf::get_slot 0.1, -1, "reload_perl";
4115 info "perl_reload: reloading...";
3794 4116
3795 warn "entering sync_job"; 4117 trace "perl_reload: entering sync_job";
3796 4118
3797 cf::sync_job { 4119 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 4120 #cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 4121
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 4122 trace "perl_reload: cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 4123 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 4124 %EXT_CORO = ();
3815 4125
3816 warn "removing commands"; 4126 trace "perl_reload: removing commands";
3817 %COMMAND = (); 4127 %COMMAND = ();
3818 4128
3819 warn "removing ext/exti commands"; 4129 trace "perl_reload: removing ext/exti commands";
3820 %EXTCMD = (); 4130 %EXTCMD = ();
3821 %EXTICMD = (); 4131 %EXTICMD = ();
3822 4132
3823 warn "unloading/nuking all extensions"; 4133 trace "perl_reload: unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 4134 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 4135 trace "... unloading $pkg";
3826 4136
3827 if (my $cb = $pkg->can ("unload")) { 4137 if (my $cb = $pkg->can ("unload")) {
3828 eval { 4138 eval {
3829 $cb->($pkg); 4139 $cb->($pkg);
3830 1 4140 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 4141 } or error "$pkg unloaded, but with errors: $@";
3832 } 4142 }
3833 4143
3834 warn "... clearing $pkg"; 4144 trace "... clearing $pkg";
3835 clear_package $pkg; 4145 clear_package $pkg;
3836 } 4146 }
3837 4147
3838 warn "unloading all perl modules loaded from $LIBDIR"; 4148 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 4149 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4150 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 4151
3842 warn "... unloading $k"; 4152 trace "... unloading $k";
3843 delete $INC{$k}; 4153 delete $INC{$k};
3844 4154
3845 $k =~ s/\.pm$//; 4155 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 4156 $k =~ s/\//::/g;
3847 4157
3850 } 4160 }
3851 4161
3852 clear_package $k; 4162 clear_package $k;
3853 } 4163 }
3854 4164
3855 warn "getting rid of safe::, as good as possible"; 4165 trace "perl_reload: getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 4166 clear_package "safe::$_"
3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4167 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3858 4168
3859 warn "unloading cf.pm \"a bit\""; 4169 trace "perl_reload: unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 4170 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4171 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 4172
3863 # don't, removes xs symbols, too, 4173 # don't, removes xs symbols, too,
3864 # and global variables created in xs 4174 # and global variables created in xs
3865 #clear_package __PACKAGE__; 4175 #clear_package __PACKAGE__;
3866 4176
3867 warn "unload completed, starting to reload now"; 4177 info "perl_reload: unload completed, starting to reload now";
3868 4178
3869 warn "reloading cf.pm"; 4179 trace "perl_reload: reloading cf.pm";
3870 require cf; 4180 require cf;
3871 cf::_connect_to_perl_1; 4181 cf::_connect_to_perl_1;
3872 4182
3873 warn "loading config and database again"; 4183 trace "perl_reload: loading config and database again";
3874 cf::reload_config; 4184 cf::reload_config;
3875 4185
3876 warn "loading extensions"; 4186 trace "perl_reload: loading extensions";
3877 cf::load_extensions; 4187 cf::load_extensions;
3878 4188
3879 if ($REATTACH_ON_RELOAD) { 4189 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 4190 trace "perl_reload: reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 4191 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 4192 trace "perl_reload: reattaching attachments to maps";
3883 reattach $_ for values %MAP; 4193 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 4194 trace "perl_reload: reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 4195 reattach $_ for values %PLAYER;
3886 } 4196 }
3887 4197
3888 warn "running post_init jobs"; 4198 cf::_post_init 1;
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890 4199
3891 warn "leaving sync_job"; 4200 trace "perl_reload: leaving sync_job";
3892 4201
3893 1 4202 1
3894 } or do { 4203 } or do {
3895 warn $@; 4204 error $@;
3896 cf::cleanup "error while reloading, exiting."; 4205 cf::cleanup "perl_reload: error, exiting.";
3897 }; 4206 };
3898 4207
3899 warn "reloaded";
3900 --$RELOAD; 4208 --$RELOAD;
3901 } 4209 }
3902 4210
3903 $t1 = AE::time - $t1; 4211 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 4212 info "perl_reload: completed in ${t1}s\n";
3905}; 4213};
3906 4214
3907our $RELOAD_WATCHER; # used only during reload 4215our $RELOAD_WATCHER; # used only during reload
3908 4216
3909sub reload_perl() { 4217sub reload_perl() {
3930 reload_perl; 4238 reload_perl;
3931 }; 4239 };
3932 } 4240 }
3933}; 4241};
3934 4242
3935unshift @INC, $LIBDIR; 4243#############################################################################
3936 4244
3937my $bug_warning = 0; 4245my $bug_warning = 0;
3938 4246
3939our @WAIT_FOR_TICK;
3940our @WAIT_FOR_TICK_BEGIN;
3941
3942sub wait_for_tick { 4247sub wait_for_tick() {
3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3944 4249
3945 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
3946 push @WAIT_FOR_TICK, $signal;
3947 $signal->wait;
3948} 4251}
3949 4252
3950sub wait_for_tick_begin { 4253sub wait_for_tick_begin() {
3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3952 4255
3953 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
3954 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
3955 $signal->wait; 4258 $signal->wait;
3956} 4259}
3960 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3961 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
3962 return; 4265 return;
3963 } 4266 }
3964 4267
3965 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
3966 4269
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3968 4271
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3971 Coro::async_pool { 4274 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4275 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4276 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4277 or error "ERROR: unable to write runtime file: $!";
3975 }; 4278 };
3976 } 4279 }
3977 4280
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4282 $sig->send;
3980 } 4283 }
3981 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
3982 $sig->send;
3983 }
3984 4285
3985 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3987 4288
3988 if (0) { 4289 if (0) {
3989 if ($NEXT_TICK) { 4290 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4291 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4292 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4293 debug "jitter $JITTER\n";#d#
3993 } 4294 }
3994 } 4295 }
3995} 4296}
3996 4297
3997{ 4298{
3998 # configure BDB 4299 # configure BDB
4300 info "initialising database";
3999 4301
4000 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
4001 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
4002 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
4003 4305
4004 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
4005 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4032 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4033 }; 4335 };
4034 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4035 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4036 }; 4338 };
4339
4340 info "database initialised";
4037} 4341}
4038 4342
4039{ 4343{
4040 # configure IO::AIO 4344 # configure IO::AIO
4041 4345
4346 info "initialising aio";
4042 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4043 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4044 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4045} 4351}
4046 4352
4047my $_log_backtrace; 4353our $_log_backtrace;
4354our $_log_backtrace_last;
4048 4355
4049sub _log_backtrace { 4356sub _log_backtrace {
4050 my ($msg, @addr) = @_; 4357 my ($msg, @addr) = @_;
4051 4358
4052 $msg =~ s/\n//; 4359 $msg =~ s/\n$//;
4053 4360
4361 if ($_log_backtrace_last eq $msg) {
4362 LOG llevInfo, "[ABT] $msg\n";
4363 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4054 # limit the # of concurrent backtraces 4364 # limit the # of concurrent backtraces
4055 if ($_log_backtrace < 2) { 4365 } elsif ($_log_backtrace < 2) {
4366 $_log_backtrace_last = $msg;
4056 ++$_log_backtrace; 4367 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg; 4368 my $perl_bt = Carp::longmess $msg;
4058 async { 4369 async {
4059 $Coro::current->{desc} = "abt $msg"; 4370 $Coro::current->{desc} = "abt $msg";
4060 4371
4080 LOG llevInfo, "[ABT] $_\n" for @bt; 4391 LOG llevInfo, "[ABT] $_\n" for @bt;
4081 --$_log_backtrace; 4392 --$_log_backtrace;
4082 }; 4393 };
4083 } else { 4394 } else {
4084 LOG llevInfo, "[ABT] $msg\n"; 4395 LOG llevInfo, "[ABT] $msg\n";
4085 LOG llevInfo, "[ABT] [suppressed]\n"; 4396 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4086 } 4397 }
4087} 4398}
4088 4399
4089# load additional modules 4400# load additional modules
4090require "cf/$_.pm" for @EXTRA_MODULES; 4401require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines