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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 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
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
112 124
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 127our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 133our $DB_ENV;
122 134
123our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 136
125our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 139
127our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
129our $NOW; 143our $NOW;
130 144
131our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
142 156
143our @POST_INIT; 157our @POST_INIT;
144 158
145our $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)
146our $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;
147 164
148binmode STDOUT; 165binmode STDOUT;
149binmode STDERR; 166binmode STDERR;
150 167
151# read virtual server time, if available 168# read virtual server time, if available
162 179
163our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
164 181
165sub cf::map::normalise; 182sub cf::map::normalise;
166 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
167############################################################################# 188#############################################################################
168 189
169%REFLECT = (); 190%REFLECT = ();
170for (@REFLECT) { 191for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
181 202
182=over 4 203=over 4
183 204
184=item $cf::UPTIME 205=item $cf::UPTIME
185 206
186The 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.
187 223
188=item $cf::RUNTIME 224=item $cf::RUNTIME
189 225
190The 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
191every server tick. 227every server tick.
197Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
200database environment. 236database environment.
201 237
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 238=item $cf::LOADAVG
211 239
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 251from wherever your confdir points to.
224 252
225=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
226 254
227These 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
228returns 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
229per 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();
230 275
231=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
232 277
233This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
234C<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
242 287
243=back 288=back
244 289
245=cut 290=cut
246 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
247$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 299 my $msg = join "", @_;
249 300
250 $msg .= "\n" 301 $msg .= "\n"
251 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
252 303
253 $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;
254 305
255 LOG llevError, $msg; 306 LOG llevWarn, $msg;
256}; 307};
257 308
258$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
260 311
261 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
262 313
263 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 316 return;#d#
266 }#d# 317 }#d#
267 318
268 # kill coroutine otherwise 319 # kill coroutine otherwise
269 Coro::terminate 320 Coro::terminate
289)) { 340)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 342}
292 343
293$EV::DIED = sub { 344$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
295}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
296 352
297############################################################################# 353#############################################################################
298 354
299=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
300 356
321 $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;
322 $d 378 $d
323 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
324} 380}
325 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
326=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
327 435
328Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
329 437
330=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
336our $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
337 445
338sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
342 481
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
345 484
346The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 486is a reload or not.
348 487
349=cut 488=cut
350 489
351sub post_init(&) { 490sub post_init(&) {
352 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 }
353} 509}
354 510
355=item cf::lock_wait $string 511=item cf::lock_wait $string
356 512
357Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
396} 552}
397 553
398=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
399 555
400Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 557get spread over time.
402 558
403=cut 559=cut
404 560
405sub periodic($$) { 561sub periodic($$) {
406 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
411} 567}
412 568
413=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
414 570
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 578
419The 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
420used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
421 581
422Useful for short background jobs. 582Useful for short background jobs.
451 } 611 }
452 } 612 }
453 613
454 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
455 # 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
456 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 617 } else {
459 $busy = 0; 618 $busy = 0;
460 Coro::schedule; 619 Coro::schedule;
461 } 620 }
462 } 621 }
502=cut 661=cut
503 662
504sub sync_job(&) { 663sub sync_job(&) {
505 my ($job) = @_; 664 my ($job) = @_;
506 665
507 if ($Coro::current == $Coro::main) { 666 if (in_main) {
508 my $time = EV::time; 667 my $time = AE::time;
509 668
510 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
512 671
513 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
514 673
515 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
516 675
517 my $busy = 1; 676 my $busy = 1;
518 my @res; 677 my @res;
519 678
520 (async { 679 (async {
521 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 681 @res = eval { $job->() };
523 warn $@ if $@; 682 error $@ if $@;
524 undef $busy; 683 undef $busy;
525 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
526 685
527 while ($busy) { 686 while ($busy) {
528 if (Coro::nready) { 687 if (Coro::nready) {
530 } else { 689 } else {
531 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
532 } 691 }
533 } 692 }
534 693
535 my $time = EV::time - $time; 694 my $time = AE::time - $time;
536 695
537 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
538 697
539 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
540 } else { 699 } else {
562 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
563 722
564 $coro 723 $coro
565} 724}
566 725
567=item fork_call { }, $args 726=item fork_call { }, @args
568 727
569Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 731never block itself or use any form of event handling.
573 732
574=cut 733=cut
575 734
735sub post_fork {
736 reset_signals;
737}
738
576sub fork_call(&@) { 739sub fork_call(&@) {
577 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
578 741
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
582 745
583 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
584 reset_signals; 747 cf::post_fork;
585 &$cb 748 &$cb
586 }, @args; 749 } @args;
587 750
588 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
589} 763}
590 764
591=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
592 766
593=cut 767=cut
630within each server. 804within each server.
631 805
632=cut 806=cut
633 807
634sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
635 my ($name) = @_; 812 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
637 814
638 eval { 815 eval {
639 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
649} 826}
650 827
651our $DB; 828our $DB;
652 829
653sub db_init { 830sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
656 };
657} 832}
658 833
659sub db_get($$) { 834sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
661 836
662 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
663 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
664 841
665 $! ? () 842 $! ? ()
666 : $data 843 : $data
667 }
668} 844}
669 845
670sub db_put($$$) { 846sub db_put($$$) {
671 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 876
701 my @data; 877 my @data;
702 my $md5; 878 my $md5;
703 879
704 for (0 .. $#$src) { 880 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 882 }
708 883
709 # if processing is expensive, check 884 # if processing is expensive, check
710 # checksum first 885 # checksum first
711 if (1) { 886 if (1) {
728 903
729 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 905 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
732 907
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 909
735 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
738 913
748 923
749=cut 924=cut
750 925
751sub datalog($@) { 926sub datalog($@) {
752 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 929}
755 930
756=back 931=back
757 932
758=cut 933=cut
953 1128
954 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1131
957 } elsif (ref $type) { 1132 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
959 1134
960 } else { 1135 } else {
961 shift @arg; 1136 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
963 } 1138 }
964 } 1139 }
965} 1140}
966 1141
967sub _object_attach { 1142sub _object_attach {
977 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
978 } 1153 }
979 1154
980 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
981 } else { 1156 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1158 }
984 1159
985 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
986} 1161}
987 1162
1046 1221
1047 for (@$callbacks) { 1222 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1049 1224
1050 if ($@) { 1225 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1227 override;
1054 } 1228 }
1055 1229
1056 return 1 if $override; 1230 return 1 if $override;
1057 } 1231 }
1136 for (@$attach) { 1310 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1139 } 1313 }
1140 } else { 1314 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1316 }
1143 } 1317 }
1144} 1318}
1145 1319
1146cf::attachable->attach ( 1320cf::attachable->attach (
1173 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1174 1348
1175 sync_job { 1349 sync_job {
1176 if (length $$rdata) { 1350 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1180 1355
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1206 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1207 1382
1208 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1385 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1212 } 1387 }
1213 } else { 1388 } else {
1214 aio_unlink $filename; 1389 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1216 } 1391 }
1240 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1416 $av = $st->{objs};
1242 } 1417 }
1243 1418
1244 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1247 1423
1248 ($data, $av) 1424 ($data, $av)
1249} 1425}
1250 1426
1251=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1310} 1486}
1311 1487
1312use File::Glob (); 1488use File::Glob ();
1313 1489
1314cf::player->attach ( 1490cf::player->attach (
1315 on_command => sub { 1491 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1317 1493
1318 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1319 or return; 1495 or return;
1320 1496
1328 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1329 1505
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1507
1332 if (ref $msg) { 1508 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1510
1338 my @reply; 1511 my @reply;
1339 1512
1340 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1343 1516
1344 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1518 if $reply;
1346 1519
1347 } else { 1520 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1522 }
1350 1523
1351 cf::override; 1524 cf::override;
1352 }, 1525 },
1353); 1526);
1363 }; 1536 };
1364 1537
1365 $grp 1538 $grp
1366} 1539}
1367 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
1368sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1369 cf::sync_job { 1557 cf::sync_job {
1370 my %todo; 1558 my %todo;
1371 1559
1372 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1561 next unless -r $path;
1391 1579
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1582
1395 $ext{source} = 1583 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1398 . $source 1586 . $source
1399 . "\n};\n1"; 1587 . "\n};\n1";
1400 1588
1401 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1402 } 1590 }
1403 1591
1592 my $pass = 0;
1404 my %done; 1593 my %done;
1405 while (%todo) { 1594 while (%todo) {
1406 my $progress; 1595 my $progress;
1407 1596
1597 ++$pass;
1598
1599 ext:
1408 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1602 next ext
1411 unless exists $done{$_}; 1603 unless exists $done{$_};
1412 } 1604 }
1413 1605
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1607
1416 unless (eval $v->{source}) { 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
1617 my $active = eval $source;
1618
1619 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1621
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1623 if exists $v->{meta}{mandatory};
1424 1624
1425 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1426 } 1634 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1635 }
1432 1636
1433 skip: 1637 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1436 } 1647 }
1437 }; 1648 };
1438} 1649}
1439 1650
1440############################################################################# 1651#############################################################################
1524 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1525 } 1736 }
1526 } 1737 }
1527} 1738}
1528 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1529sub save($) { 1753sub save($) {
1530 my ($pl) = @_; 1754 my ($pl) = @_;
1531 1755
1532 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1533 1757
1538 1762
1539 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1541 1765
1542 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1770
1544 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1772 cf::cede_to_tick;
1546} 1773}
1547 1774
1581 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1582 1809
1583 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1584 $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
1585 1812
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1814 $pl->deactivate;
1815
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1591 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1592 1821
1593 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1649 \@logins 1878 \@logins
1650} 1879}
1651 1880
1652=item $player->maps 1881=item $player->maps
1653 1882
1883=item cf::player::maps $login
1884
1654Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1655player. May block. 1886player. May block.
1656 1887
1657=cut 1888=cut
1658 1889
1720=cut 1951=cut
1721 1952
1722sub find_by_path($) { 1953sub find_by_path($) {
1723 my ($path) = @_; 1954 my ($path) = @_;
1724 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1725 my ($match, $specificity); 1958 my ($match, $specificity);
1726 1959
1727 for my $region (list) { 1960 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1757sub generate_random_map { 1990sub generate_random_map {
1758 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1759 1992
1760 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
1761 1994
1762 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774 (cf::region::find $rmp->{region}), $rmp->{custom}
1775 )
1776} 1996}
1777 1997
1778=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1779 1999
1780Register 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
1785 2005
1786sub register { 2006sub register {
1787 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 2008 my $pkg = caller;
1789 2009
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 2011
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 2013}
1795 2014
1796# also paths starting with '/' 2015# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 2017
1799sub thawer_merge { 2018sub thawer_merge {
1800 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1801 2020
1802 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1807} 2026}
1808 2027
1809sub normalise { 2028sub normalise {
1810 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1811 2030
1812 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1813 2032
1814 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1815 2034
1816 # map plan: 2035 # map plan:
1817 # 2036 #
1832 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 2052 $path = "$base/$path";
1834 } 2053 }
1835 2054
1836 for ($path) { 2055 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1840 } 2058 }
1841 2059
1842 $path 2060 $path
1856 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1857 return $self; 2075 return $self;
1858 } 2076 }
1859 } 2077 }
1860 2078
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 2080 ()
1863} 2081}
1864 2082
2083# may re-bless or do other evil things
1865sub init { 2084sub init {
1866 my ($self) = @_; 2085 my ($self) = @_;
1867 2086
1868 $self 2087 $self
1869} 2088}
1934 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1935 2154
1936 1 2155 1
1937} 2156}
1938 2157
2158# used to laod the header of an original map
1939sub load_header_orig { 2159sub load_header_orig {
1940 my ($self) = @_; 2160 my ($self) = @_;
1941 2161
1942 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1943} 2163}
1944 2164
2165# used to laod the header of an instantiated map
1945sub load_header_temp { 2166sub load_header_temp {
1946 my ($self) = @_; 2167 my ($self) = @_;
1947 2168
1948 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1949} 2170}
1950 2171
2172# called after loading the header from an instantiated map
1951sub prepare_temp { 2173sub prepare_temp {
1952 my ($self) = @_; 2174 my ($self) = @_;
1953 2175
1954 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1956 # safety 2178 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2181}
1960 2182
2183# called after loading the header from an original map
1961sub prepare_orig { 2184sub prepare_orig {
1962 my ($self) = @_; 2185 my ($self) = @_;
1963 2186
1964 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1989 2212
1990sub find; 2213sub find;
1991sub find { 2214sub find {
1992 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1993 2216
2217 cf::cede_to_tick;
2218
1994 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1995 2220
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2223
1999 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
2030 2255
2031 { 2256 {
2032 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2033 2258
2034 return unless $self->valid; 2259 return unless $self->valid;
2035 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2036
2037 $self->in_memory (cf::MAP_LOADING);
2038 2261
2039 $self->alloc; 2262 $self->alloc;
2040 2263
2041 $self->pre_load; 2264 $self->pre_load;
2042 cf::cede_to_tick; 2265 cf::cede_to_tick;
2043 2266
2267 if (exists $self->{load_path}) {
2044 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block; 2269 $f->skip_block;
2046 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2047 or return; 2271 or return;
2048 2272
2049 $self->post_load_original 2273 $self->post_load_original
2050 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2051 2275
2052 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2053 utf8::encode $uniq; 2277 utf8::encode $uniq;
2054 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2056 $self->clear_unique_items; 2280 $self->clear_unique_items;
2057 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2059 } 2284 }
2060 } 2285 }
2061 }
2062 2286
2063 $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);
2064 2294
2065 cf::cede_to_tick; 2295 cf::cede_to_tick;
2066 # now do the right thing for maps 2296 # now do the right thing for maps
2067 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2068 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2072 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2303 $self->decay_objects;
2074 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2075 $self->update_buttons; 2305 $self->update_buttons;
2076 cf::cede_to_tick; 2306 cf::cede_to_tick;
2077 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2078 } 2308 }
2079 2309
2080 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2082
2083 $self->in_memory (cf::MAP_ACTIVE);
2084 } 2312 }
2085 2313
2086 $self->post_load; 2314 $self->post_load;
2087}
2088 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2089sub customise_for { 2322sub customise_for {
2090 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2091 2324
2092 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2326 if $self->per_player;
2096# if $self->per_party; 2329# if $self->per_party;
2097 2330
2098 $self 2331 $self
2099} 2332}
2100 2333
2101# find and load all maps in the 3x3 area around a map
2102sub load_neighbours {
2103 my ($map) = @_;
2104
2105 my @neigh; # diagonal neighbours
2106
2107 for (0 .. 3) {
2108 my $neigh = $map->tile_path ($_)
2109 or next;
2110 $neigh = find $neigh, $map
2111 or next;
2112 $neigh->load;
2113
2114 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 }
2118
2119 for (grep defined $_->[0], @neigh) {
2120 my ($path, $origin) = @$_;
2121 my $neigh = find $path, $origin
2122 or next;
2123 $neigh->load;
2124 }
2125}
2126
2127sub find_sync { 2334sub find_sync {
2128 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2129 2336
2130 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
2131} 2342}
2132 2343
2133sub do_load_sync { 2344sub do_load_sync {
2134 my ($map) = @_; 2345 my ($map) = @_;
2135 2346
2347 # it's a bug to call this from the main context
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2138 2350
2139 cf::sync_job { $map->load }; 2351 $map->load;
2140} 2352}
2141 2353
2142our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2144 2356
2145sub find_async { 2357sub find_async {
2146 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2147 2359
2148 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2149 2361
2150 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2152 } 2364 }
2153 2365
2154 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2155 2367
2156 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2170 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2171 2383
2172 () 2384 ()
2173} 2385}
2174 2386
2387# common code, used by both ->save and ->swapout
2175sub save { 2388sub _save {
2176 my ($self) = @_; 2389 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2390
2180 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2181 2392
2182 return unless $self->dirty; 2393 return unless $self->dirty;
2183 2394
2203 } else { 2414 } else {
2204 $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);
2205 } 2416 }
2206} 2417}
2207 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2208sub swap_out { 2427sub swap_out {
2209 my ($self) = @_; 2428 my ($self) = @_;
2210 2429
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2216 return if $self->players; 2434 return if $self->players;
2217 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
2218 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2219 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
2220 $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};
2221 2486
2222 $self->deactivate; 2487 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2489 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2490
2270 $self->unlink_save; 2491 $self->unlink_save;
2271 $self->destroy; 2492 $self->destroy;
2272} 2493}
2273 2494
2281 2502
2282 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2283 2504
2284 $self->unlink_save; 2505 $self->unlink_save;
2285 2506
2286 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2512
2521 2742
2522Freezes 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}>).
2523 2744
2524The 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.
2525for 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,
2526though, 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
2527map. 2748map.
2528 2749
2529Will never block. 2750Will never block.
2530 2751
2531=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2552sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2553 my ($self) = @_; 2774 my ($self) = @_;
2554 2775
2555 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2556 2777
2778 ++$self->{_link_recursion};
2779
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2781
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2561 2784
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2786}
2564 2787
2565sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2567 2790
2587 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2588 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2589 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2590 2813
2591 $map->load; 2814 $map->load;
2592 $map->load_neighbours;
2593 2815
2594 return unless $self->contr->active; 2816 return unless $self->contr->active;
2595 2817
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2598 2820 # entering was successful
2821 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2823 $self->activate_recursive;
2601} 2824 }
2602 2825
2826}
2827
2603=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)]])
2604 2829
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
2615 2840
2616our $GOTOGEN; 2841our $GOTOGEN;
2617 2842
2618sub cf::object::player::goto { 2843sub cf::object::player::goto {
2619 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 }
2620 2851
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2854
2624 $self->enter_link; 2855 $self->enter_link;
2644 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2645 } 2876 }
2646 } 2877 }
2647 2878
2648 my $map = eval { 2879 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650 2881
2651 if ($map) { 2882 if ($map) {
2652 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2885 } else {
2655 $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);
2656 } 2887 }
2657 2888
2658 $map 2889 $map
2666 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2669 } 2900 }
2670 2901
2671 $done->() if $done; 2902 $done->($self) if $done;
2672 })->prio (1); 2903 })->prio (1);
2673} 2904}
2674 2905
2675=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2676 2907
2744 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2745 2976
2746 unless (eval { 2977 unless (eval {
2747 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2748 2979
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2758 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2759 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 }
2760 3006
2761 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2762 3008
2763 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2769 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "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. "
2771 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2773 3019
2774 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 3021 $self->leave_link;
2776 } 3022 }
2777 })->prio (1); 3023 })->prio (1);
2778} 3024}
2779 3025
3006=cut 3252=cut
3007 3253
3008sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3009 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3010 3256
3011 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3013 } elsif ($self->extcmd == 1) {
3014 #TODO: version 1, remove
3015 unshift @msg, msgtype => "reply", msgid => $id;
3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3017 }
3018} 3260}
3019 3261
3020=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3021 3263
3022Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
3077 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3078 3320
3079 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3080 3322
3081 if (ref $msg) { 3323 if (ref $msg) {
3082 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3083 "ARRAY" eq ref $msg
3084 ? @$msg
3085 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3086 3325
3087 my @reply; 3326 my @reply;
3088 3327
3089 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3090 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3092 3331
3093 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3333 if $reply;
3095 3334
3096 } else { 3335 } else {
3097 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098 } 3337 }
3099 3338
3100 cf::override; 3339 cf::override;
3101 }, 3340 },
3102); 3341);
3122 3361
3123 $coro 3362 $coro
3124} 3363}
3125 3364
3126cf::client->attach ( 3365cf::client->attach (
3127 on_destroy => sub { 3366 on_client_destroy => sub {
3128 my ($ns) = @_; 3367 my ($ns) = @_;
3129 3368
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3370 },
3132); 3371);
3183 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3187) { 3426) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3429 for @funs;
3192} 3430}
3193 3431
3232 local @cf::_safe_eval_args = values %vars; 3470 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3471 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3472 }
3235 3473
3236 if ($@) { 3474 if ($@) {
3237 warn "$@"; 3475 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3240 } 3478 }
3241 3479
3242 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3243} 3481}
3244 3482
3269=cut 3507=cut
3270 3508
3271############################################################################# 3509#############################################################################
3272# the server's init and main functions 3510# the server's init and main functions
3273 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3274sub load_facedata($) { 3514sub load_facedata($) {
3275 my ($path) = @_; 3515 my ($path) = @_;
3276 3516
3277 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3278 # for this (global event?) 3518 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3520
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3522
3283 warn "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3284 3524
3285 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3286 0 < aio_load $path, $facedata
3287 or die "$path: $!";
3288
3289 $facedata = Coro::Storable::thaw $facedata;
3290 3526
3291 $facedata->{version} == 2 3527 $facedata->{version} == 2
3292 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3293 3529
3294 # patch in the exptable 3530 # patch in the exptable
3301 cf::cede_to_tick; 3537 cf::cede_to_tick;
3302 3538
3303 { 3539 {
3304 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3305 3541
3306 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3307 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308 3545
3309 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3310 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3313 3552
3314 cf::cede_to_tick; 3553 cf::cede_to_tick;
3315 } 3554 }
3316 3555
3317 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
3322 3561
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3562 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3563 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3565 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3566 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3567 }
3329 3568
3330 cf::cede_to_tick; 3569 cf::cede_to_tick;
3331 } 3570 }
3332 } 3571 }
3344 3583
3345 { 3584 {
3346 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3347 3586
3348 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3591
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3354 } else { 3596 } else {
3355 $RESOURCE{$name} = $info; 3597# $RESOURCE{$name} = $info; # unused
3356 } 3598 }
3357 3599
3358 cf::cede_to_tick; 3600 cf::cede_to_tick;
3359 } 3601 }
3360 } 3602 }
3361 3603
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3605
3364 1 3606 1
3365} 3607}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3608
3387register_exticmd fx_want => sub { 3609register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3610 my ($ns, $want) = @_;
3389 3611
3390 while (my ($k, $v) = each %$want) { 3612 while (my ($k, $v) = each %$want) {
3429sub reload_treasures { 3651sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3652 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3653 or die "unable to load treasurelists\n";
3432} 3654}
3433 3655
3656sub reload_sound {
3657 trace "loading sound config from $DATADIR/sound\n";
3658
3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3660
3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3662 my $sound = $soundconf->{compat}[$_]
3663 or next;
3664
3665 my $face = cf::face::find "sound/$sound->[1]";
3666 cf::sound::set $sound->[0] => $face;
3667 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3668 }
3669
3670 while (my ($k, $v) = each %{$soundconf->{event}}) {
3671 my $face = cf::face::find "sound/$v";
3672 cf::sound::set $k => $face;
3673 }
3674}
3675
3434sub reload_resources { 3676sub reload_resources {
3435 warn "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3436 3678
3679 reload_exp_table;
3680 reload_materials;
3437 reload_facedata; 3681 reload_facedata;
3682 reload_sound;
3438 reload_archetypes; 3683 reload_archetypes;
3439 reload_regions; 3684 reload_regions;
3440 reload_treasures; 3685 reload_treasures;
3441 3686
3442 warn "finished reloading resource files\n"; 3687 trace "finished reloading resource files\n";
3443} 3688}
3444 3689
3445sub reload_config { 3690sub reload_config {
3446 warn "reloading config file...\n"; 3691 trace "reloading config file...\n";
3447 3692
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3693 my $config = load_file "$CONFDIR/config";
3449 or return; 3694 utf8::decode $config;
3695 *CFG = decode_yaml $config;
3450 3696
3451 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>;
3453
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3698
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3701
3459 if (exists $CFG{mlockall}) { 3702 if (exists $CFG{mlockall}) {
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3705 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3706 };
3464 warn $@ if $@; 3707 warn $@ if $@;
3465 } 3708 }
3466
3467 warn "finished reloading resource files\n";
3468} 3709}
3469 3710
3470sub pidfile() { 3711sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3712 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3713 or die "$PIDFILE: $!";
3485 seek $fh, 0, 0; 3726 seek $fh, 0, 0;
3486 print $fh $$; 3727 print $fh $$;
3487} 3728}
3488 3729
3489sub main_loop { 3730sub main_loop {
3490 warn "EV::loop starting\n"; 3731 trace "EV::loop starting\n";
3491 if (1) { 3732 if (1) {
3492 EV::loop; 3733 EV::loop;
3493 } 3734 }
3494 warn "EV::loop returned\n"; 3735 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3736 goto &main_loop unless $REALLY_UNLOOP;
3496} 3737}
3497 3738
3498sub main { 3739sub main {
3499 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3500 3741
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505 3746
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3748
3513 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3516 (async { 3752 (async {
3517 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3518 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3519 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3520 }; 3756 };
3521 3757
3522 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3523 3759
3524 cf::sync_job { 3760 cf::sync_job {
3761 cf::incloader::init ();
3762
3763 cf::init_anim;
3764 cf::init_attackmess;
3765 cf::init_dynamic;
3766
3525 cf::load_settings; 3767 cf::load_settings;
3526 cf::load_materials;
3527 3768
3528 reload_resources; 3769 reload_resources;
3529 reload_config; 3770 reload_config;
3530 db_init; 3771 db_init;
3531 3772
3532 cf::init_uuid; 3773 cf::init_uuid;
3533 cf::init_signals; 3774 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3775 cf::init_skills;
3536 3776
3537 cf::init_beforeplay; 3777 cf::init_beforeplay;
3538 3778
3539 atomic; 3779 atomic;
3544 3784
3545 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3786 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3788
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3550 }; 3790 };
3551 3791
3792 cf::object::thawer::errors_are_fatal 0;
3793 info "parse errors in files are no longer fatal from this point on.\n";
3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3552 main_loop; 3799 goto &main_loop;
3553} 3800}
3554 3801
3555############################################################################# 3802#############################################################################
3556# initialisation and cleanup 3803# initialisation and cleanup
3557 3804
3558# install some emergency cleanup handlers 3805# install some emergency cleanup handlers
3559BEGIN { 3806BEGIN {
3560 our %SIGWATCHER = (); 3807 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3808 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3809 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3810 cf::cleanup "SIG$signal";
3564 }; 3811 };
3565 } 3812 }
3566} 3813}
3567 3814
3568sub write_runtime_sync { 3815sub write_runtime_sync {
3816 my $t0 = AE::time;
3817
3569 # first touch the runtime file to show we are still running: 3818 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3819 # the fsync below can take a very very long time.
3571 3820
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3821 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3822
3574 my $guard = cf::lock_acquire "write_runtime"; 3823 my $guard = cf::lock_acquire "write_runtime";
3575 3824
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3825 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3826 or return;
3578 3827
3579 my $value = $cf::RUNTIME + 90 + 10; 3828 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3829 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3830 # 60 allows for the watchdog to kill the server.
3594 or return; 3843 or return;
3595 3844
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3845 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3846 and return;
3598 3847
3599 warn "runtime file written.\n"; 3848 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3849
3601 1 3850 1
3602} 3851}
3603 3852
3604our $uuid_lock; 3853our $uuid_lock;
3616 or return; 3865 or return;
3617 3866
3618 my $value = uuid_seq uuid_cur; 3867 my $value = uuid_seq uuid_cur;
3619 3868
3620 unless ($value) { 3869 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3870 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3871 return;
3623 } 3872 }
3624 3873
3625 my $value = uuid_str $value + $uuid_skip; 3874 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3875 $uuid_skip = 0;
3636 or return; 3885 or return;
3637 3886
3638 aio_rename "$uuid~", $uuid 3887 aio_rename "$uuid~", $uuid
3639 and return; 3888 and return;
3640 3889
3641 warn "uuid file written ($value).\n"; 3890 trace "uuid file written ($value).\n";
3642 3891
3643 1 3892 1
3644 3893
3645} 3894}
3646 3895
3652} 3901}
3653 3902
3654sub emergency_save() { 3903sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3904 my $freeze_guard = cf::freeze_mainloop;
3656 3905
3657 warn "emergency_perl_save: enter\n"; 3906 info "emergency_perl_save: enter\n";
3907
3908 # this is a trade-off: we want to be very quick here, so
3909 # save all maps without fsync, and later call a global sync
3910 # (which in turn might be very very slow)
3911 local $USE_FSYNC = 0;
3658 3912
3659 cf::sync_job { 3913 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3914 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3915
3665 # use a peculiar iteration method to avoid tripping on perl 3916 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3917 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3918 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3919 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3920 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3921 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3922 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3923 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3924 $pl->save;
3674 } 3925 }
3675 warn "emergency_perl_save: end player save\n"; 3926 info "emergency_perl_save: end player save\n";
3676 3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3677 warn "emergency_perl_save: begin map save\n"; 3930 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3931 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3932 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3933 $map->valid or next;
3681 $map->save; 3934 $map->save;
3682 } 3935 }
3683 warn "emergency_perl_save: end map save\n"; 3936 info "emergency_perl_save: end map save\n";
3684 3937
3938 cf::write_runtime_sync; # external watchdog should not bark
3939
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3940 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3941 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3942 info "emergency_perl_save: end database checkpoint\n";
3688 3943
3689 warn "emergency_perl_save: begin write uuid\n"; 3944 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3945 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 3946 info "emergency_perl_save: end write uuid\n";
3947
3948 cf::write_runtime_sync; # external watchdog should not bark
3949
3950 trace "emergency_perl_save: syncing database to disk";
3951 BDB::db_env_txn_checkpoint $DB_ENV;
3952
3953 info "emergency_perl_save: starting sync\n";
3954 IO::AIO::aio_sync sub {
3955 info "emergency_perl_save: finished sync\n";
3956 };
3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3960 trace "emergency_perl_save: flushing outstanding aio requests";
3961 while (IO::AIO::nreqs || BDB::nreqs) {
3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3963 }
3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3692 }; 3966 };
3693 3967
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3968 info "emergency_perl_save: leave\n";
3700} 3969}
3701 3970
3702sub post_cleanup { 3971sub post_cleanup {
3703 my ($make_core) = @_; 3972 my ($make_core) = @_;
3704 3973
3974 IO::AIO::flush;
3975
3705 warn Carp::longmess "post_cleanup backtrace" 3976 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3977 if $make_core;
3707 3978
3708 my $fh = pidfile; 3979 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3980 unlink $PIDFILE if <$fh> == $$;
3710} 3981}
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4001 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 4002 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 4003 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4004# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 4005 }
3735 warn "cleared package $pkg\n";#d#
3736} 4006}
3737 4007
3738sub do_reload_perl() { 4008sub do_reload_perl() {
3739 # can/must only be called in main 4009 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 4010 unless (in_main) {
3741 warn "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3742 return; 4012 return;
3743 } 4013 }
3744 4014
3745 return if $RELOAD++; 4015 return if $RELOAD++;
3746 4016
3747 my $t1 = EV::time; 4017 my $t1 = AE::time;
3748 4018
3749 while ($RELOAD) { 4019 while ($RELOAD) {
3750 warn "reloading..."; 4020 cf::get_slot 0.1, -1, "reload_perl";
4021 info "perl_reload: reloading...";
3751 4022
3752 warn "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3753 4024
3754 cf::sync_job { 4025 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 4026 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 4027
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 4030 %EXT_CORO = ();
3772 4031
3773 warn "removing commands"; 4032 trace "perl_reload: removing commands";
3774 %COMMAND = (); 4033 %COMMAND = ();
3775 4034
3776 warn "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 4036 %EXTCMD = ();
3778 %EXTICMD = (); 4037 %EXTICMD = ();
3779 4038
3780 warn "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 4041 trace "... unloading $pkg";
3783 4042
3784 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3785 eval { 4044 eval {
3786 $cb->($pkg); 4045 $cb->($pkg);
3787 1 4046 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 4047 } or error "$pkg unloaded, but with errors: $@";
3789 } 4048 }
3790 4049
3791 warn "... clearing $pkg"; 4050 trace "... clearing $pkg";
3792 clear_package $pkg; 4051 clear_package $pkg;
3793 } 4052 }
3794 4053
3795 warn "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 4057
3799 warn "... unloading $k"; 4058 trace "... unloading $k";
3800 delete $INC{$k}; 4059 delete $INC{$k};
3801 4060
3802 $k =~ s/\.pm$//; 4061 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 4062 $k =~ s/\//::/g;
3804 4063
3807 } 4066 }
3808 4067
3809 clear_package $k; 4068 clear_package $k;
3810 } 4069 }
3811 4070
3812 warn "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 4072 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 4074
3816 warn "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 4078
3820 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3821 # and global variables created in xs 4080 # and global variables created in xs
3822 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3823 4082
3824 warn "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3825 4084
3826 warn "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3827 require cf; 4086 require cf;
3828 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3829 4088
3830 warn "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 4090 cf::reload_config;
3832 4091
3833 warn "loading extensions"; 4092 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 4093 cf::load_extensions;
3835 4094
3836 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3843 } 4102 }
3844 4103
3845 warn "running post_init jobs"; 4104 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 4105
3848 warn "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3849 4107
3850 1 4108 1
3851 } or do { 4109 } or do {
3852 warn $@; 4110 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4112 };
3855 4113
3856 warn "reloaded";
3857 --$RELOAD; 4114 --$RELOAD;
3858 } 4115 }
3859 4116
3860 $t1 = EV::time - $t1; 4117 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3862}; 4119};
3863 4120
3864our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3865 4122
3866sub reload_perl() { 4123sub reload_perl() {
3868 # coro crashes during coro_state_free->destroy here. 4125 # coro crashes during coro_state_free->destroy here.
3869 4126
3870 $RELOAD_WATCHER ||= cf::async { 4127 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4128 Coro::AIO::aio_wait cache_extensions;
3872 4129
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4130 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4131 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4132 undef $RELOAD_WATCHER;
3876 }; 4133 };
3877 }; 4134 };
3878} 4135}
3887 reload_perl; 4144 reload_perl;
3888 }; 4145 };
3889 } 4146 }
3890}; 4147};
3891 4148
3892unshift @INC, $LIBDIR; 4149#############################################################################
3893 4150
3894my $bug_warning = 0; 4151my $bug_warning = 0;
3895 4152
3896our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN;
3898
3899sub wait_for_tick { 4153sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3901 4155
3902 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
3903 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait;
3905} 4157}
3906 4158
3907sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3909 4161
3910 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4164 $signal->wait;
3913} 4165}
3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3918 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
3919 return; 4171 return;
3920 } 4172 }
3921 4173
3922 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
3923 4175
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4177
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4180 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4181 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4182 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4183 or error "ERROR: unable to write runtime file: $!";
3932 }; 4184 };
3933 } 4185 }
3934 4186
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4188 $sig->send;
3937 } 4189 }
3938 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
3939 $sig->send;
3940 }
3941 4191
3942 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3944 4194
3945 if (0) { 4195 if (0) {
3946 if ($NEXT_TICK) { 4196 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4197 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4198 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4199 debug "jitter $JITTER\n";#d#
3950 } 4200 }
3951 } 4201 }
3952} 4202}
3953 4203
3954{ 4204{
3955 # configure BDB 4205 # configure BDB
3956 4206
3957 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
3960 4210
3961 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3999 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4002} 4252}
4003 4253
4004my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4005 4256
4006sub _log_backtrace { 4257sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4008 4259
4009 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4010 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4268 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4015 async { 4270 async {
4016 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4017 4272
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4293 --$_log_backtrace;
4039 }; 4294 };
4040 } else { 4295 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4298 }
4044} 4299}
4045 4300
4046# load additional modules 4301# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines