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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.596 by root, Fri Nov 9 20:37:57 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 = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; 119#our %RESOURCE; # unused
112 120
113our $OUTPUT_RATE_MIN = 4000; 121our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
115 126
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 129our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
121our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 135our $DB_ENV;
125 136
126our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 138
128our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 141
130our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
132our $NOW; 145our $NOW;
133 146
134our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
145 158
146our @POST_INIT; 159our @POST_INIT;
147 160
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
150 166
151binmode STDOUT; 167binmode STDOUT;
152binmode STDERR; 168binmode STDERR;
153 169
154# read virtual server time, if available 170# read virtual server time, if available
188 204
189=over 4 205=over 4
190 206
191=item $cf::UPTIME 207=item $cf::UPTIME
192 208
193The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
194 225
195=item $cf::RUNTIME 226=item $cf::RUNTIME
196 227
197The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
198every server tick. 229every server tick.
199 230
200=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203 234
204Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
207database environment. 238database environment.
208 239
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 240=item $cf::LOADAVG
218 241
219The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
220(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
221objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
230from wherever your confdir points to. 253from wherever your confdir points to.
231 254
232=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
233 256
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 258returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::Wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
237 277
238=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
239 279
240This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
249 289
250=back 290=back
251 291
252=cut 292=cut
253 293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
254$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 301 my $msg = join "", @_;
256 302
257 $msg .= "\n" 303 $msg .= "\n"
258 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
259 305
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 307
262 LOG llevError, $msg; 308 LOG llevWarn, $msg;
263}; 309};
264 310
265$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
267 313
268 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
269 315
270 if (in_main) {#d# 316 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 318 return;#d#
273 }#d# 319 }#d#
274 320
275 # kill coroutine otherwise 321 # kill coroutine otherwise
276 Coro::terminate 322 Coro::terminate
296)) { 342)) {
297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298} 344}
299 345
300$EV::DIED = sub { 346$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
302}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
303 354
304############################################################################# 355#############################################################################
305 356
306=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
307 358
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 380 $d
330 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
331} 382}
332 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
333=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
334 437
335Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
336 439
337=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 447
345sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
347 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
348=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
349 483
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
352 486
353The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 488is a reload or not.
355 489
356=cut 490=cut
357 491
358sub post_init(&) { 492sub post_init(&) {
359 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
360} 511}
361 512
362=item cf::lock_wait $string 513=item cf::lock_wait $string
363 514
364Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
417 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
418} 569}
419 570
420=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
421 572
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority les than zero, interactive jobs
579should use 100 or more.
425 580
426The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
428 583
429Useful for short background jobs. 584Useful for short background jobs.
458 } 613 }
459 } 614 }
460 615
461 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
462 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
463 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 619 } else {
466 $busy = 0; 620 $busy = 0;
467 Coro::schedule; 621 Coro::schedule;
468 } 622 }
469 } 623 }
509=cut 663=cut
510 664
511sub sync_job(&) { 665sub sync_job(&) {
512 my ($job) = @_; 666 my ($job) = @_;
513 667
514 if ($Coro::current == $Coro::main) { 668 if (in_main) {
515 my $time = AE::time; 669 my $time = AE::time;
516 670
517 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
519 673
520 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
521 675
522 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
523 677
524 my $busy = 1; 678 my $busy = 1;
525 my @res; 679 my @res;
526 680
527 (async { 681 (async {
528 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 683 @res = eval { $job->() };
530 warn $@ if $@; 684 error $@ if $@;
531 undef $busy; 685 undef $busy;
532 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
533 687
534 while ($busy) { 688 while ($busy) {
535 if (Coro::nready) { 689 if (Coro::nready) {
569 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
570 724
571 $coro 725 $coro
572} 726}
573 727
574=item fork_call { }, $args 728=item fork_call { }, @args
575 729
576Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 733never block itself or use any form of event handling.
580 734
581=cut 735=cut
582 736
737sub post_fork {
738 reset_signals;
739}
740
583sub fork_call(&@) { 741sub fork_call(&@) {
584 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
585 743
586 # we seemingly have to make a local copy of the whole thing, 744 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
589 747
590 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
591 reset_signals; 749 cf::post_fork;
592 &$cb 750 &$cb
593 }, @args; 751 } @args;
594 752
595 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
596} 754}
597 755
598sub objinfo { 756sub objinfo {
648within each server. 806within each server.
649 807
650=cut 808=cut
651 809
652sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
653 my ($name) = @_; 814 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
655 816
656 eval { 817 eval {
657 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
667} 828}
668 829
669our $DB; 830our $DB;
670 831
671sub db_init { 832sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
674 };
675} 834}
676 835
677sub db_get($$) { 836sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
679 838
680 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
681 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
682 843
683 $! ? () 844 $! ? ()
684 : $data 845 : $data
685 }
686} 846}
687 847
688sub db_put($$$) { 848sub db_put($$$) {
689 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
718 878
719 my @data; 879 my @data;
720 my $md5; 880 my $md5;
721 881
722 for (0 .. $#$src) { 882 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 884 }
726 885
727 # if processing is expensive, check 886 # if processing is expensive, check
728 # checksum first 887 # checksum first
729 if (1) { 888 if (1) {
746 905
747 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 907 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
750 909
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 911
753 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
756 915
766 925
767=cut 926=cut
768 927
769sub datalog($@) { 928sub datalog($@) {
770 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 931}
773 932
774=back 933=back
775 934
776=cut 935=cut
971 1130
972 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1133
975 } elsif (ref $type) { 1134 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
977 1136
978 } else { 1137 } else {
979 shift @arg; 1138 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
981 } 1140 }
982 } 1141 }
983} 1142}
984 1143
985sub _object_attach { 1144sub _object_attach {
995 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
996 } 1155 }
997 1156
998 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
999 } else { 1158 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1160 }
1002 1161
1003 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
1004} 1163}
1005 1164
1064 1223
1065 for (@$callbacks) { 1224 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1067 1226
1068 if ($@) { 1227 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1229 override;
1072 } 1230 }
1073 1231
1074 return 1 if $override; 1232 return 1 if $override;
1075 } 1233 }
1154 for (@$attach) { 1312 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1157 } 1315 }
1158 } else { 1316 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1318 }
1161 } 1319 }
1162} 1320}
1163 1321
1164cf::attachable->attach ( 1322cf::attachable->attach (
1191 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1192 1350
1193 sync_job { 1351 sync_job {
1194 if (length $$rdata) { 1352 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1198 1357
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1361 if ($cf::USE_FSYNC) {
1224 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1225 1384
1226 $filename =~ s%/[^/]+$%%; 1385 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1386 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1387 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1230 } 1389 }
1231 } else { 1390 } else {
1232 aio_unlink $filename; 1391 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1234 } 1393 }
1258 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1418 $av = $st->{objs};
1260 } 1419 }
1261 1420
1262 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1265 1425
1266 ($data, $av) 1426 ($data, $av)
1267} 1427}
1268 1428
1269=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1273=cut 1433=cut
1274 1434
1275############################################################################# 1435#############################################################################
1276# command handling &c 1436# command handling &c
1277 1437
1278=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1279 1439
1280Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1281$name. 1441$name.
1282 1442
1283=cut 1443=cut
1289 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1290 1450
1291 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1292} 1452}
1293 1453
1294=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1295 1455
1296Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1297extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1298received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1299the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1300has logged in successfully. 1460has logged in successfully.
1301 1461
1302If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1303called.
1304 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1305=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1306 1470
1307Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1308exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1309are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1310is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1311log-in. 1475log-in.
1312 1476
1313If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1314called.
1315 1478
1316=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1317 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1318sub register_extcmd { 1486sub register_extcmd($$) {
1319 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1320 1488
1321 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1322} 1490}
1323 1491
1324sub register_exticmd { 1492sub register_async_extcmd($$) {
1325 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1326 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1327 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1328} 1508}
1329 1509
1330use File::Glob (); 1510use File::Glob ();
1331 1511
1332cf::player->attach ( 1512cf::player->attach (
1346 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1347 1527
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1529
1350 if (ref $msg) { 1530 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1532
1356 my @reply;
1357
1358 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1360 } 1551 }
1361 1552
1362 $pl->ext_reply ($reply, @reply)
1363 if $reply;
1364
1365 } else { 1553 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1555 }
1368 1556
1369 cf::override; 1557 cf::override;
1370 }, 1558 },
1371); 1559);
1381 }; 1569 };
1382 1570
1383 $grp 1571 $grp
1384} 1572}
1385 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1386sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1387 cf::sync_job { 1590 cf::sync_job {
1388 my %todo; 1591 my %todo;
1389 1592
1390 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1594 next unless -r $path;
1409 1612
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1615
1413 $ext{source} = 1616 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1416 . $source 1619 . $source
1417 . "\n};\n1"; 1620 . "\n};\n1";
1418 1621
1419 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1431 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1635 next ext
1433 unless exists $done{$_}; 1636 unless exists $done{$_};
1434 } 1637 }
1435 1638
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1640
1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1438 my $active = eval $v->{source}; 1650 my $active = eval $source;
1439 1651
1440 if (length $@) { 1652 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1653 error "$v->{path}: $@\n";
1442 1654
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1656 if exists $v->{meta}{mandatory};
1445 1657
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1448 } else { 1660 } else {
1449 $done{$k} = delete $todo{$k}; 1661 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1662 push @EXTS, $v->{pkg};
1451 $progress = 1; 1663 $progress = 1;
1452 1664
1453 warn "$v->{base}: extension inactive.\n" 1665 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1666 unless $active;
1455 } 1667 }
1456 } 1668 }
1457 1669
1458 unless ($progress) { 1670 unless ($progress) {
1460 1672
1461 while (my ($k, $v) = each %todo) { 1673 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1675 if exists $v->{meta}{mandatory};
1464 } 1676 }
1677
1678 last;
1465 } 1679 }
1466 } 1680 }
1467 }; 1681 };
1468} 1682}
1469 1683
1627 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1628 1842
1629 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1845
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1847 $pl->deactivate;
1848
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1637 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1638 1854
1639 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1695 \@logins 1911 \@logins
1696} 1912}
1697 1913
1698=item $player->maps 1914=item $player->maps
1699 1915
1916=item cf::player::maps $login
1917
1700Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1701player. May block. 1919player. May block.
1702 1920
1703=cut 1921=cut
1704 1922
1725 1943
1726=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1727 1945
1728Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1729 1947
1730=item $player->ext_reply ($msgid, @msg)
1731
1732Sends an ext reply to the player.
1733
1734=cut
1735
1736sub ext_reply($$@) {
1737 my ($self, $id, @msg) = @_;
1738
1739 $self->ns->ext_reply ($id, @msg)
1740}
1741
1742=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1743 1949
1744Sends an ext event to the client. 1950Sends an ext event to the client.
1745 1951
1746=cut 1952=cut
1765 1971
1766=cut 1972=cut
1767 1973
1768sub find_by_path($) { 1974sub find_by_path($) {
1769 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1770 1978
1771 my ($match, $specificity); 1979 my ($match, $specificity);
1772 1980
1773 for my $region (list) { 1981 for my $region (list) {
1774 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1803sub generate_random_map { 2011sub generate_random_map {
1804 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1805 2013
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807 2015
1808 # mit "rum" bekleckern, nicht
1809 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813 $rmp->{exit_on_final_map},
1814 $rmp->{xsize}, $rmp->{ysize},
1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820 (cf::region::find $rmp->{region}), $rmp->{custom}
1821 )
1822} 2017}
1823 2018
1824=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1825 2020
1826Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1831 2026
1832sub register { 2027sub register {
1833 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1834 my $pkg = caller; 2029 my $pkg = caller;
1835 2030
1836 no strict;
1837 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1838 2032
1839 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840} 2034}
1841 2035
1842# also paths starting with '/' 2036# also paths starting with '/'
1843$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844 2038
1845sub thawer_merge { 2039sub thawer_merge {
1846 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1847 2041
1848 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1853} 2047}
1854 2048
1855sub normalise { 2049sub normalise {
1856 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1857 2051
1858 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1859 2053
1860 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1861 2055
1862 # map plan: 2056 # map plan:
1863 # 2057 #
1878 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1879 $path = "$base/$path"; 2073 $path = "$base/$path";
1880 } 2074 }
1881 2075
1882 for ($path) { 2076 for ($path) {
1883 redo if s{//}{/};
1884 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1885 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1886 } 2079 }
1887 2080
1888 $path 2081 $path
1902 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1903 return $self; 2096 return $self;
1904 } 2097 }
1905 } 2098 }
1906 2099
1907 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1908 () 2101 ()
1909} 2102}
1910 2103
2104# may re-bless or do other evil things
1911sub init { 2105sub init {
1912 my ($self) = @_; 2106 my ($self) = @_;
1913 2107
1914 $self 2108 $self
1915} 2109}
1980 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1981 2175
1982 1 2176 1
1983} 2177}
1984 2178
2179# used to laod the header of an original map
1985sub load_header_orig { 2180sub load_header_orig {
1986 my ($self) = @_; 2181 my ($self) = @_;
1987 2182
1988 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1989} 2184}
1990 2185
2186# used to laod the header of an instantiated map
1991sub load_header_temp { 2187sub load_header_temp {
1992 my ($self) = @_; 2188 my ($self) = @_;
1993 2189
1994 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1995} 2191}
1996 2192
2193# called after loading the header from an instantiated map
1997sub prepare_temp { 2194sub prepare_temp {
1998 my ($self) = @_; 2195 my ($self) = @_;
1999 2196
2000 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
2001 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
2002 # safety 2199 # safety
2003 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
2004 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
2005} 2202}
2006 2203
2204# called after loading the header from an original map
2007sub prepare_orig { 2205sub prepare_orig {
2008 my ($self) = @_; 2206 my ($self) = @_;
2009 2207
2010 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
2011 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
2035 2233
2036sub find; 2234sub find;
2037sub find { 2235sub find {
2038 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2039 2237
2238 cf::cede_to_tick;
2239
2040 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
2041 2241
2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
2044 2244
2045 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2076 2276
2077 { 2277 {
2078 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2079 2279
2080 return unless $self->valid; 2280 return unless $self->valid;
2081 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2082
2083 $self->in_memory (cf::MAP_LOADING);
2084 2282
2085 $self->alloc; 2283 $self->alloc;
2086 2284
2087 $self->pre_load; 2285 $self->pre_load;
2088 cf::cede_to_tick; 2286 cf::cede_to_tick;
2089 2287
2288 if (exists $self->{load_path}) {
2090 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2091 $f->skip_block; 2290 $f->skip_block;
2092 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2093 or return; 2292 or return;
2094 2293
2095 $self->post_load_original 2294 $self->post_load_original
2096 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2097 2296
2098 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2099 utf8::encode $uniq; 2298 utf8::encode $uniq;
2100 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2101 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2102 $self->clear_unique_items; 2301 $self->clear_unique_items;
2103 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2104 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2105 } 2305 }
2106 } 2306 }
2107 }
2108 2307
2109 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2110 2315
2111 cf::cede_to_tick; 2316 cf::cede_to_tick;
2112 # now do the right thing for maps 2317 # now do the right thing for maps
2113 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2114 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2118 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2119 $self->decay_objects; 2324 $self->decay_objects;
2120 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2121 $self->update_buttons; 2326 $self->update_buttons;
2122 cf::cede_to_tick; 2327 cf::cede_to_tick;
2123 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2124 } 2329 }
2125 2330
2126 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2128
2129 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2333 }
2131 2334
2132 $self->post_load; 2335 $self->post_load;
2336
2337 1
2133} 2338}
2134 2339
2135# customize the map for a given player, i.e. 2340# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player 2341# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath 2342# maps to change the path to ~playername/mappath
2145# if $self->per_party; 2350# if $self->per_party;
2146 2351
2147 $self 2352 $self
2148} 2353}
2149 2354
2150# find and load all maps in the 3x3 area around a map
2151sub load_neighbours {
2152 my ($map) = @_;
2153
2154 my @neigh; # diagonal neighbours
2155
2156 for (0 .. 3) {
2157 my $neigh = $map->tile_path ($_)
2158 or next;
2159 $neigh = find $neigh, $map
2160 or next;
2161 $neigh->load;
2162
2163 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 }
2167
2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
2170 my $neigh = find $path, $origin
2171 or next;
2172 $neigh->load;
2173 }
2174}
2175
2176sub find_sync { 2355sub find_sync {
2177 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2178 2357
2179 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2180} 2363}
2181 2364
2182sub do_load_sync { 2365sub do_load_sync {
2183 my ($map) = @_; 2366 my ($map) = @_;
2184 2367
2368 # it's a bug to call this from the main context
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2187 2371
2188 cf::sync_job { $map->load }; 2372 $map->load;
2189} 2373}
2190 2374
2191our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2193 2377
2194sub find_async { 2378sub find_async {
2195 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2196 2380
2197 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2198 2382
2199 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2201 } 2385 }
2202 2386
2203 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2204 2388
2205 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2264sub swap_out { 2448sub swap_out {
2265 my ($self) = @_; 2449 my ($self) = @_;
2266 2450
2267 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2268 2452
2269 return if $self->in_memory != cf::MAP_ACTIVE; 2453 return if !$self->linkable;
2270 return if $self->{deny_save}; 2454 return if $self->{deny_save};
2271 return if $self->players; 2455 return if $self->players;
2272 2456
2273 # first deactivate the map and "unlink" it from the core 2457 # first deactivate the map and "unlink" it from the core
2274 $self->deactivate; 2458 $self->deactivate;
2275 $_->clear_links_to ($self) for values %cf::MAP; 2459 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED); 2460 $self->state (cf::MAP_SWAPPED);
2277 2461
2278 # then atomically save 2462 # then atomically save
2279 $self->_save; 2463 $self->_save;
2280 2464
2281 # then free the map 2465 # then free the map
2305 2489
2306 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2307 2491
2308 return if $self->players; 2492 return if $self->players;
2309 2493
2310 warn "resetting map ", $self->path, "\n"; 2494 cf::trace "resetting map ", $self->path, "\n";
2311 2495
2312 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2313 2497
2314 # need to save uniques path 2498 # need to save uniques path
2315 unless ($self->{deny_save}) { 2499 unless ($self->{deny_save}) {
2316 my $uniq = $self->uniq_path; utf8::encode $uniq; 2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2317 2501
2339 2523
2340 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2341 2525
2342 $self->unlink_save; 2526 $self->unlink_save;
2343 2527
2344 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2345 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2346 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2347 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349 2533
2579 2763
2580Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2581 2765
2582The player should be reasonably safe there for short amounts of time (e.g. 2766The player should be reasonably safe there for short amounts of time (e.g.
2583for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link 2768though, as the player cannot control the character while it is on the link
2585map. 2769map.
2586 2770
2587Will never block. 2771Will never block.
2588 2772
2589=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2610sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2611 my ($self) = @_; 2795 my ($self) = @_;
2612 2796
2613 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2614 2798
2799 ++$self->{_link_recursion};
2800
2615 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2616 2802
2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2619 2805
2645 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2646 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2647 if $x <= 0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2648 2834
2649 $map->load; 2835 $map->load;
2650 $map->load_neighbours;
2651 2836
2652 return unless $self->contr->active; 2837 return unless $self->contr->active;
2653 2838
2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2656 2841 # entering was successful
2842 delete $self->{_link_recursion};
2657 # only activate afterwards, to support waiting in hooks 2843 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive; 2844 $self->activate_recursive;
2659} 2845 }
2660 2846
2847}
2848
2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662 2850
2663Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2664her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2665that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2666the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2673 2861
2674our $GOTOGEN; 2862our $GOTOGEN;
2675 2863
2676sub cf::object::player::goto { 2864sub cf::object::player::goto {
2677 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2678 2872
2679 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681 2875
2682 $self->enter_link; 2876 $self->enter_link;
2702 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2703 } 2897 }
2704 } 2898 }
2705 2899
2706 my $map = eval { 2900 my $map = eval {
2707 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2708 2902
2709 if ($map) { 2903 if ($map) {
2710 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2711 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2712 } else { 2906 } else {
2713 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714 } 2908 }
2715 2909
2716 $map 2910 $map
2724 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2725 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2726 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2727 } 2921 }
2728 2922
2729 $done->() if $done; 2923 $done->($self) if $done;
2730 })->prio (1); 2924 })->prio (1);
2731} 2925}
2732 2926
2733=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2734 2928
2802 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2803 2997
2804 unless (eval { 2998 unless (eval {
2805 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2806 3000
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2816 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2818 3027
2819 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2820 3029
2821 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2827 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2828 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2829 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2830 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2831 3040
2832 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2833 $self->leave_link; 3042 $self->leave_link;
2834 } 3043 }
2835 })->prio (1); 3044 })->prio (1);
2836} 3045}
2837 3046
3047=cut 3256=cut
3048 3257
3049sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3050 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3051 3260
3052 if ($self->extcmd == 2) {
3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3054 } elsif ($self->extcmd == 1) { # TODO: remove
3055 push @msg, msgtype => "event_$type";
3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3057 }
3058}
3059
3060=item $client->ext_reply ($msgid, @msg)
3061
3062Sends an ext reply to the client.
3063
3064=cut
3065
3066sub cf::client::ext_reply($$@) {
3067 my ($self, $id, @msg) = @_;
3068
3069 if ($self->extcmd == 2) {
3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3071 } elsif ($self->extcmd == 1) {
3072 #TODO: version 1, remove
3073 unshift @msg, msgtype => "reply", msgid => $id;
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3075 }
3076} 3262}
3077 3263
3078=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3079 3265
3080Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3135 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3136 3322
3137 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3138 3324
3139 if (ref $msg) { 3325 if (ref $msg) {
3140 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3141 "ARRAY" eq ref $msg
3142 ? @$msg
3143 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3144 3327
3145 my @reply;
3146
3147 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3148 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3149 } 3346 }
3150
3151 $ns->ext_reply ($reply, @reply)
3152 if $reply;
3153
3154 } else { 3347 } else {
3155 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156 } 3349 }
3157 3350
3158 cf::override; 3351 cf::override;
3159 }, 3352 },
3160); 3353);
3241 decrease split destroy change_exp value msg lore send_msg)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3242 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3243 ["cf::player" => qw(peaceful send_msg)], 3436 ["cf::player" => qw(peaceful send_msg)],
3244 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3245) { 3438) {
3246 no strict 'refs';
3247 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249 for @funs; 3441 for @funs;
3250} 3442}
3251 3443
3290 local @cf::_safe_eval_args = values %vars; 3482 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval; 3483 @res = wantarray ? eval eval : scalar eval $eval;
3292 } 3484 }
3293 3485
3294 if ($@) { 3486 if ($@) {
3295 warn "$@"; 3487 warn "$@",
3296 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3297 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3298 } 3490 }
3299 3491
3300 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3301} 3493}
3302 3494
3327=cut 3519=cut
3328 3520
3329############################################################################# 3521#############################################################################
3330# the server's init and main functions 3522# the server's init and main functions
3331 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub set_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3547
3332sub load_facedata($) { 3548sub load_facedata($) {
3333 my ($path) = @_; 3549 my ($path) = @_;
3334 3550
3335 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3336 # for this (global event?) 3552 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3338 3554
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340 3556
3341 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3342 3558
3343 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3344 0 < aio_load $path, $facedata
3345 or die "$path: $!";
3346
3347 $facedata = Coro::Storable::thaw $facedata;
3348 3560
3349 $facedata->{version} == 2 3561 $facedata->{version} == 2
3350 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3351 3563
3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3354 $facedata->{resource}{"res/exp_table"} = {
3355 type => FT_RSRC,
3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3358 };
3359 cf::cede_to_tick; 3564 cf::cede_to_tick;
3360 3565
3361 { 3566 {
3362 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3363 3568
3364 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3365 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3366 3572
3367 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3368 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3371 3579
3372 cf::cede_to_tick; 3580 cf::cede_to_tick;
3373 } 3581 }
3374 3582
3375 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3380 3588
3381 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3382 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384 } else { 3592 } else {
3385 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3386 } 3594 }
3387 3595
3388 cf::cede_to_tick; 3596 cf::cede_to_tick;
3389 } 3597 }
3390 } 3598 }
3402 3610
3403 { 3611 {
3404 my $res = $facedata->{resource}; 3612 my $res = $facedata->{resource};
3405 3613
3406 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3407 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3408 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409 3618
3619 cf::face::set_type $idx, $type;
3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type}; 3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3412 } else { 3623 } else {
3413 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3414 } 3625 }
3415 3626
3416 cf::cede_to_tick; 3627 cf::cede_to_tick;
3417 } 3628 }
3418 } 3629 }
3419 3630
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421 3632
3422 1 3633 1
3423} 3634}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3444 3635
3445register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3446 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3447 3638
3448 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3456 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3458 cf::arch::commit_load; 3649 cf::arch::commit_load;
3459 3650
3460 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 set_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3461} 3665}
3462 3666
3463sub reload_regions { 3667sub reload_regions {
3464 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3465 # for this (global event?) 3669 # for this (global event?)
3480} 3684}
3481 3685
3482sub reload_archetypes { 3686sub reload_archetypes {
3483 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3484 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 set_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 set_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3485} 3698}
3486 3699
3487sub reload_treasures { 3700sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3490} 3703}
3491 3704
3705sub reload_sound {
3706 trace "loading sound config from $DATADIR/sound\n";
3707
3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3709
3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3711 my $sound = $soundconf->{compat}[$_]
3712 or next;
3713
3714 my $face = cf::face::find "sound/$sound->[1]";
3715 cf::sound::set $sound->[0] => $face;
3716 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3717 }
3718
3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face;
3722 }
3723}
3724
3492sub reload_resources { 3725sub reload_resources {
3493 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3494 3727
3728 reload_materials;
3495 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3496 reload_archetypes; 3732 reload_archetypes;
3497 reload_regions; 3733 reload_regions;
3498 reload_treasures; 3734 reload_treasures;
3499 3735
3500 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3501} 3737}
3502 3738
3503sub reload_config { 3739sub reload_config {
3504 warn "reloading config file...\n"; 3740 trace "reloading config file...\n";
3505 3741
3506 open my $fh, "<:utf8", "$CONFDIR/config" 3742 my $config = load_file "$CONFDIR/config";
3507 or return; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3508 3745
3509 local $/;
3510 *CFG = YAML::XS::Load scalar <$fh>;
3511
3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513 3747
3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516 3750
3517 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3753 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520 and die "WARNING: m(un)lockall failed: $!\n"; 3754 and die "WARNING: m(un)lockall failed: $!\n";
3521 }; 3755 };
3522 warn $@ if $@; 3756 warn $@ if $@;
3523 } 3757 }
3524
3525 warn "finished reloading resource files\n";
3526} 3758}
3527 3759
3528sub pidfile() { 3760sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3761 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!"; 3762 or die "$PIDFILE: $!";
3543 seek $fh, 0, 0; 3775 seek $fh, 0, 0;
3544 print $fh $$; 3776 print $fh $$;
3545} 3777}
3546 3778
3547sub main_loop { 3779sub main_loop {
3548 warn "EV::loop starting\n"; 3780 trace "EV::loop starting\n";
3549 if (1) { 3781 if (1) {
3550 EV::loop; 3782 EV::loop;
3551 } 3783 }
3552 warn "EV::loop returned\n"; 3784 trace "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP; 3785 goto &main_loop unless $REALLY_UNLOOP;
3554} 3786}
3555 3787
3556sub main { 3788sub main {
3557 cf::init_globals; # initialise logging 3789 cf::init_globals; # initialise logging
3558 3790
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563 3795
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565 3797
3566 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3567 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3569 (async { 3801 (async {
3570 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3571 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3572 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3573 }; 3805 };
3574 3806
3575 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3576 3808
3577 cf::sync_job { 3809 cf::sync_job {
3578 cf::init_experience; 3810 cf::incloader::init ();
3811
3812 db_init;
3813
3579 cf::init_anim; 3814 cf::init_anim;
3580 cf::init_attackmess; 3815 cf::init_attackmess;
3581 cf::init_dynamic; 3816 cf::init_dynamic;
3582 3817
3583 cf::load_settings; 3818 cf::load_settings;
3584 cf::load_materials;
3585 3819
3586 reload_resources; 3820 reload_resources;
3587 reload_config; 3821 reload_config;
3588 db_init;
3589 3822
3590 cf::init_uuid; 3823 cf::init_uuid;
3591 cf::init_signals; 3824 cf::init_signals;
3592 cf::init_skills; 3825 cf::init_skills;
3593 3826
3601 3834
3602 # no (long-running) fork's whatsoever before this point(!) 3835 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX (); 3836 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3837 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605 3838
3606 (pop @POST_INIT)->(0) while @POST_INIT; 3839 cf::_post_init 0;
3607 }; 3840 };
3608 3841
3609 cf::object::thawer::errors_are_fatal 0; 3842 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n"; 3843 info "parse errors in files are no longer fatal from this point on.\n";
3611 3844
3845 AE::postpone {
3846 undef &main; # free gobs of memory :)
3847 };
3848
3612 main_loop; 3849 goto &main_loop;
3613} 3850}
3614 3851
3615############################################################################# 3852#############################################################################
3616# initialisation and cleanup 3853# initialisation and cleanup
3617 3854
3656 or return; 3893 or return;
3657 3894
3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659 and return; 3896 and return;
3660 3897
3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662 3899
3663 1 3900 1
3664} 3901}
3665 3902
3666our $uuid_lock; 3903our $uuid_lock;
3678 or return; 3915 or return;
3679 3916
3680 my $value = uuid_seq uuid_cur; 3917 my $value = uuid_seq uuid_cur;
3681 3918
3682 unless ($value) { 3919 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n"; 3920 info "cowardly refusing to write zero uuid value!\n";
3684 return; 3921 return;
3685 } 3922 }
3686 3923
3687 my $value = uuid_str $value + $uuid_skip; 3924 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0; 3925 $uuid_skip = 0;
3698 or return; 3935 or return;
3699 3936
3700 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3701 and return; 3938 and return;
3702 3939
3703 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3704 3941
3705 1 3942 1
3706 3943
3707} 3944}
3708 3945
3714} 3951}
3715 3952
3716sub emergency_save() { 3953sub emergency_save() {
3717 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3718 3955
3719 warn "emergency_perl_save: enter\n"; 3956 info "emergency_perl_save: enter\n";
3957
3958 # this is a trade-off: we want to be very quick here, so
3959 # save all maps without fsync, and later call a global sync
3960 # (which in turn might be very very slow)
3961 local $USE_FSYNC = 0;
3720 3962
3721 cf::sync_job { 3963 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so 3964 cf::write_runtime_sync; # external watchdog should not bark
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726 3965
3727 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3728 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3729 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3730 warn "emergency_perl_save: begin player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3731 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3732 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3733 $pl->valid or next; 3972 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735 $pl->save; 3974 $pl->save;
3736 } 3975 }
3737 warn "emergency_perl_save: end player save\n"; 3976 info "emergency_perl_save: end player save\n";
3738 3977
3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3739 warn "emergency_perl_save: begin map save\n"; 3980 info "emergency_perl_save: begin map save\n";
3740 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3741 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3742 $map->valid or next; 3983 $map->valid or next;
3743 $map->save; 3984 $map->save;
3744 } 3985 }
3745 warn "emergency_perl_save: end map save\n"; 3986 info "emergency_perl_save: end map save\n";
3746 3987
3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3747 warn "emergency_perl_save: begin database checkpoint\n"; 3990 info "emergency_perl_save: begin database checkpoint\n";
3748 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3749 warn "emergency_perl_save: end database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3750 3993
3751 warn "emergency_perl_save: begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1; 3995 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n"; 3996 info "emergency_perl_save: end write uuid\n";
3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 trace "emergency_perl_save: syncing database to disk";
4001 BDB::db_env_txn_checkpoint $DB_ENV;
4002
4003 info "emergency_perl_save: starting sync\n";
4004 IO::AIO::aio_sync sub {
4005 info "emergency_perl_save: finished sync\n";
4006 };
4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 trace "emergency_perl_save: flushing outstanding aio requests";
4011 while (IO::AIO::nreqs || BDB::nreqs) {
4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4013 }
4014
4015 cf::write_runtime_sync; # external watchdog should not bark
3754 }; 4016 };
3755 4017
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3761 warn "emergency_perl_save: leave\n"; 4018 info "emergency_perl_save: leave\n";
3762} 4019}
3763 4020
3764sub post_cleanup { 4021sub post_cleanup {
3765 my ($make_core) = @_; 4022 my ($make_core) = @_;
3766 4023
4024 IO::AIO::flush;
4025
3767 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3768 if $make_core; 4027 if $make_core;
3769 4028
3770 my $fh = pidfile; 4029 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$; 4030 unlink $PIDFILE if <$fh> == $$;
3772} 4031}
3796 } 4055 }
3797} 4056}
3798 4057
3799sub do_reload_perl() { 4058sub do_reload_perl() {
3800 # can/must only be called in main 4059 # can/must only be called in main
3801 if (in_main) { 4060 unless (in_main) {
3802 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3803 return; 4062 return;
3804 } 4063 }
3805 4064
3806 return if $RELOAD++; 4065 return if $RELOAD++;
3807 4066
3808 my $t1 = AE::time; 4067 my $t1 = AE::time;
3809 4068
3810 while ($RELOAD) { 4069 while ($RELOAD) {
3811 warn "reloading..."; 4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
3812 4072
3813 warn "entering sync_job"; 4073 trace "perl_reload: entering sync_job";
3814 4074
3815 cf::sync_job { 4075 cf::sync_job {
3816 cf::write_runtime_sync; # external watchdog should not bark
3817 cf::emergency_save; 4076 #cf::emergency_save;
3818 cf::write_runtime_sync; # external watchdog should not bark
3819 4077
3820 warn "syncing database to disk";
3821 BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823 # if anything goes wrong in here, we should simply crash as we already saved
3824
3825 warn "flushing outstanding aio requests";
3826 while (IO::AIO::nreqs || BDB::nreqs) {
3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828 }
3829
3830 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3831 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3832 %EXT_CORO = (); 4080 %EXT_CORO = ();
3833 4081
3834 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3835 %COMMAND = (); 4083 %COMMAND = ();
3836 4084
3837 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3838 %EXTCMD = (); 4086 %EXTCMD = ();
3839 %EXTICMD = (); 4087 %EXTICMD = ();
3840 4088
3841 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3842 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3843 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3844 4092
3845 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3846 eval { 4094 eval {
3847 $cb->($pkg); 4095 $cb->($pkg);
3848 1 4096 1
3849 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
3850 } 4098 }
3851 4099
3852 warn "... clearing $pkg"; 4100 trace "... clearing $pkg";
3853 clear_package $pkg; 4101 clear_package $pkg;
3854 } 4102 }
3855 4103
3856 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859 4107
3860 warn "... unloading $k"; 4108 trace "... unloading $k";
3861 delete $INC{$k}; 4109 delete $INC{$k};
3862 4110
3863 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3865 4113
3868 } 4116 }
3869 4117
3870 clear_package $k; 4118 clear_package $k;
3871 } 4119 }
3872 4120
3873 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3874 clear_package "safe::$_" 4122 clear_package "safe::$_"
3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4123 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876 4124
3877 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3878 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880 4128
3881 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3882 # and global variables created in xs 4130 # and global variables created in xs
3883 #clear_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3884 4132
3885 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3886 4134
3887 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3888 require cf; 4136 require cf;
3889 cf::_connect_to_perl_1; 4137 cf::_connect_to_perl_1;
3890 4138
3891 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3892 cf::reload_config; 4140 cf::reload_config;
3893 4141
3894 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3895 cf::load_extensions; 4143 cf::load_extensions;
3896 4144
3897 if ($REATTACH_ON_RELOAD) { 4145 if ($REATTACH_ON_RELOAD) {
3898 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3899 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3900 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3901 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3902 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3903 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
3904 } 4152 }
3905 4153
3906 warn "running post_init jobs"; 4154 cf::_post_init 1;
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908 4155
3909 warn "leaving sync_job"; 4156 trace "perl_reload: leaving sync_job";
3910 4157
3911 1 4158 1
3912 } or do { 4159 } or do {
3913 warn $@; 4160 error $@;
3914 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
3915 }; 4162 };
3916 4163
3917 warn "reloaded";
3918 --$RELOAD; 4164 --$RELOAD;
3919 } 4165 }
3920 4166
3921 $t1 = AE::time - $t1; 4167 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n"; 4168 info "perl_reload: completed in ${t1}s\n";
3923}; 4169};
3924 4170
3925our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3926 4172
3927sub reload_perl() { 4173sub reload_perl() {
3948 reload_perl; 4194 reload_perl;
3949 }; 4195 };
3950 } 4196 }
3951}; 4197};
3952 4198
3953unshift @INC, $LIBDIR; 4199#############################################################################
3954 4200
3955my $bug_warning = 0; 4201my $bug_warning = 0;
3956 4202
3957our @WAIT_FOR_TICK;
3958our @WAIT_FOR_TICK_BEGIN;
3959
3960sub wait_for_tick { 4203sub wait_for_tick() {
3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3962 4205
3963 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3964 push @WAIT_FOR_TICK, $signal;
3965 $signal->wait;
3966} 4207}
3967 4208
3968sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3970 4211
3971 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3972 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3973 $signal->wait; 4214 $signal->wait;
3974} 4215}
3978 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3979 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3980 return; 4221 return;
3981 } 4222 }
3982 4223
3983 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
3984 4225
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3986 4227
3987 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989 Coro::async_pool { 4230 Coro::async_pool {
3990 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3991 write_runtime_sync 4232 write_runtime_sync
3992 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3993 }; 4234 };
3994 } 4235 }
3995 4236
3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997 $sig->send; 4238 $sig->send;
3998 } 4239 }
3999 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
4000 $sig->send;
4001 }
4002 4241
4003 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
4004 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4005 4244
4006 if (0) { 4245 if (0) {
4007 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
4011 } 4250 }
4012 } 4251 }
4013} 4252}
4014 4253
4015{ 4254{
4016 # configure BDB 4255 # configure BDB
4256 info "initialising database";
4017 4257
4018 BDB::min_parallel 16; 4258 BDB::min_parallel 16;
4019 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
4020 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
4021 4261
4022 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
4023 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4050 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4051 }; 4291 };
4052 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4053 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4054 }; 4294 };
4295
4296 info "database initialised";
4055} 4297}
4056 4298
4057{ 4299{
4058 # configure IO::AIO 4300 # configure IO::AIO
4059 4301
4302 info "initialising aio";
4060 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
4061 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
4062 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
4063} 4307}
4064 4308
4065my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
4066 4311
4067sub _log_backtrace { 4312sub _log_backtrace {
4068 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
4069 4314
4070 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
4071 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
4073 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
4074 ++$_log_backtrace; 4323 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg; 4324 my $perl_bt = Carp::longmess $msg;
4076 async { 4325 async {
4077 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
4078 4327
4098 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
4099 --$_log_backtrace; 4348 --$_log_backtrace;
4100 }; 4349 };
4101 } else { 4350 } else {
4102 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
4103 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104 } 4353 }
4105} 4354}
4106 4355
4107# load additional modules 4356# load additional modules
4108require "cf/$_.pm" for @EXTRA_MODULES; 4357require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines