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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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 ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
115 122
116our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d# 124our $VERBOSE_IO = 1;
118 125
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 128our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
124our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 134our $DB_ENV;
128 135
129our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 137
131our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 140
133our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
135our $NOW; 144our $NOW;
136 145
137our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
148 157
149our @POST_INIT; 158our @POST_INIT;
150 159
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
153 165
154binmode STDOUT; 166binmode STDOUT;
155binmode STDERR; 167binmode STDERR;
156 168
157# read virtual server time, if available 169# read virtual server time, if available
191 203
192=over 4 204=over 4
193 205
194=item $cf::UPTIME 206=item $cf::UPTIME
195 207
196The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
197 224
198=item $cf::RUNTIME 225=item $cf::RUNTIME
199 226
200The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 228every server tick.
202 229
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 233
207Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
210database environment. 237database environment.
211 238
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 239=item $cf::LOADAVG
221 240
222The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 252from wherever your confdir points to.
234 253
235=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
236 255
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::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();
240 277
241=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
242 279
243This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252 289
253=back 290=back
254 291
255=cut 292=cut
256 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
257$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 301 my $msg = join "", @_;
259 302
260 $msg .= "\n" 303 $msg .= "\n"
261 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
262 305
263 $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;
264 307
265 LOG llevError, $msg; 308 LOG llevWarn, $msg;
266}; 309};
267 310
268$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
270 313
271 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
272 315
273 if (in_main) {#d# 316 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 318 return;#d#
276 }#d# 319 }#d#
277 320
278 # kill coroutine otherwise 321 # kill coroutine otherwise
279 Coro::terminate 322 Coro::terminate
299)) { 342)) {
300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301} 344}
302 345
303$EV::DIED = sub { 346$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
305}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
306 354
307############################################################################# 355#############################################################################
308 356
309=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
310 358
331 $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;
332 $d 380 $d
333 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
334} 382}
335 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
336=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
337 437
338Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
339 439
340=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
346our $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
347 447
348sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
352 483
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
355 486
356The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 488is a reload or not.
358 489
359=cut 490=cut
360 491
361sub post_init(&) { 492sub post_init(&) {
362 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 }
363} 511}
364 512
365=item cf::lock_wait $string 513=item cf::lock_wait $string
366 514
367Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
420 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
421} 569}
422 570
423=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
424 572
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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 less than zero, interactive jobs
579should use 100 or more.
428 580
429The 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
430used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
431 583
432Useful for short background jobs. 584Useful for short background jobs.
461 } 613 }
462 } 614 }
463 615
464 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
465 # 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
466 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
467 $signal->wait;
468 } else { 619 } else {
469 $busy = 0; 620 $busy = 0;
470 Coro::schedule; 621 Coro::schedule;
471 } 622 }
472 } 623 }
512=cut 663=cut
513 664
514sub sync_job(&) { 665sub sync_job(&) {
515 my ($job) = @_; 666 my ($job) = @_;
516 667
517 if ($Coro::current == $Coro::main) { 668 if (in_main) {
518 my $time = AE::time; 669 my $time = AE::time;
519 670
520 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
522 673
523 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
524 675
525 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
526 677
527 my $busy = 1; 678 my $busy = 1;
528 my @res; 679 my @res;
529 680
530 (async { 681 (async {
531 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 683 @res = eval { $job->() };
533 warn $@ if $@; 684 error $@ if $@;
534 undef $busy; 685 undef $busy;
535 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
536 687
537 while ($busy) { 688 while ($busy) {
538 if (Coro::nready) { 689 if (Coro::nready) {
572 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
573 724
574 $coro 725 $coro
575} 726}
576 727
577=item fork_call { }, $args 728=item fork_call { }, @args
578 729
579Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 733never block itself or use any form of event handling.
583 734
584=cut 735=cut
585 736
737sub post_fork {
738 reset_signals;
739}
740
586sub fork_call(&@) { 741sub fork_call(&@) {
587 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
588 743
589 # we seemingly have to make a local copy of the whole thing,
590 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious)
592
593 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
594 reset_signals; 745 cf::post_fork;
595 &$cb 746 &$cb
596 }, @args; 747 } @args;
597 748
598 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
599} 750}
600 751
601sub objinfo { 752sub objinfo {
651within each server. 802within each server.
652 803
653=cut 804=cut
654 805
655sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
656 my ($name) = @_; 810 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
658 812
659 eval { 813 eval {
660 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
670} 824}
671 825
672our $DB; 826our $DB;
673 827
674sub db_init { 828sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
677 };
678} 830}
679 831
680sub db_get($$) { 832sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
682 834
683 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
684 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
685 839
686 $! ? () 840 $! ? ()
687 : $data 841 : $data
688 }
689} 842}
690 843
691sub db_put($$$) { 844sub db_put($$$) {
692 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 874
722 my @data; 875 my @data;
723 my $md5; 876 my $md5;
724 877
725 for (0 .. $#$src) { 878 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 880 }
729 881
730 # if processing is expensive, check 882 # if processing is expensive, check
731 # checksum first 883 # checksum first
732 if (1) { 884 if (1) {
745 897
746 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
747 } 899 }
748 } 900 }
749 901
750 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
751 my $data = $process->(\@data); 903 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
753 905
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 907
756 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
759 911
769 921
770=cut 922=cut
771 923
772sub datalog($@) { 924sub datalog($@) {
773 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 927}
776 928
777=back 929=back
778 930
779=cut 931=cut
974 1126
975 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1129
978 } elsif (ref $type) { 1130 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
980 1132
981 } else { 1133 } else {
982 shift @arg; 1134 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
984 } 1136 }
985 } 1137 }
986} 1138}
987 1139
988sub _object_attach { 1140sub _object_attach {
998 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
999 } 1151 }
1000 1152
1001 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
1002 } else { 1154 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1156 }
1005 1157
1006 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
1007} 1159}
1008 1160
1067 1219
1068 for (@$callbacks) { 1220 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1070 1222
1071 if ($@) { 1223 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1225 override;
1075 } 1226 }
1076 1227
1077 return 1 if $override; 1228 return 1 if $override;
1078 } 1229 }
1157 for (@$attach) { 1308 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1160 } 1311 }
1161 } else { 1312 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1314 }
1164 } 1315 }
1165} 1316}
1166 1317
1167cf::attachable->attach ( 1318cf::attachable->attach (
1194 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1195 1346
1196 sync_job { 1347 sync_job {
1197 if (length $$rdata) { 1348 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1351 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1352 if $VERBOSE_IO;
1202 1353
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1228 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1229 1380
1230 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1383 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1234 } 1385 }
1235 } else { 1386 } else {
1236 aio_unlink $filename; 1387 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1238 } 1389 }
1262 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1414 $av = $st->{objs};
1264 } 1415 }
1265 1416
1266 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1419 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1420 if $VERBOSE_IO;
1270 1421
1271 ($data, $av) 1422 ($data, $av)
1272} 1423}
1273 1424
1278=cut 1429=cut
1279 1430
1280############################################################################# 1431#############################################################################
1281# command handling &c 1432# command handling &c
1282 1433
1283=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1284 1435
1285Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1286$name. 1437$name.
1287 1438
1288=cut 1439=cut
1294 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1295 1446
1296 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1297} 1448}
1298 1449
1299=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1300 1451
1301Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1302extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1303received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1304the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1305has logged in successfully. 1456has logged in successfully.
1306 1457
1307If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1308called.
1309 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1310=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1311 1466
1312Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1313exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1314are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1315is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1316log-in. 1471log-in.
1317 1472
1318If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1319called.
1320 1474
1321=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1323sub register_extcmd { 1482sub register_extcmd($$) {
1324 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1325 1484
1326 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1327} 1486}
1328 1487
1329sub register_exticmd { 1488sub register_async_extcmd($$) {
1330 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1331 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1332 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1333} 1504}
1334 1505
1335use File::Glob (); 1506use File::Glob ();
1336 1507
1337cf::player->attach ( 1508cf::player->attach (
1351 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1352 1523
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1525
1355 if (ref $msg) { 1526 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1528
1361 my @reply;
1362
1363 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1364 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1365 } 1547 }
1366 1548
1367 $pl->ext_reply ($reply, @reply)
1368 if $reply;
1369
1370 } else { 1549 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1551 }
1373 1552
1374 cf::override; 1553 cf::override;
1375 }, 1554 },
1376); 1555);
1386 }; 1565 };
1387 1566
1388 $grp 1567 $grp
1389} 1568}
1390 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1391sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1392 cf::sync_job { 1586 cf::sync_job {
1393 my %todo; 1587 my %todo;
1394 1588
1395 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1590 next unless -r $path;
1414 1608
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1611
1418 $ext{source} = 1612 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1421 . $source 1615 . $source
1422 . "\n};\n1"; 1616 . "\n};\n1";
1423 1617
1424 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1436 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1631 next ext
1438 unless exists $done{$_}; 1632 unless exists $done{$_};
1439 } 1633 }
1440 1634
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1443 my $active = eval $v->{source}; 1646 my $active = eval $source;
1444 1647
1445 if (length $@) { 1648 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1447 1650
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1652 if exists $v->{meta}{mandatory};
1450 1653
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1453 } else { 1656 } else {
1454 $done{$k} = delete $todo{$k}; 1657 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1658 push @EXTS, $v->{pkg};
1456 $progress = 1; 1659 $progress = 1;
1457 1660
1458 warn "$v->{base}: extension inactive.\n" 1661 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1662 unless $active;
1460 } 1663 }
1461 } 1664 }
1462 1665
1463 unless ($progress) { 1666 unless ($progress) {
1465 1668
1466 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1469 } 1672 }
1673
1674 last;
1470 } 1675 }
1471 } 1676 }
1472 }; 1677 };
1473} 1678}
1474 1679
1632 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1633 1838
1634 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1636 1841
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1843 $pl->deactivate;
1844
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1642 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1643 1850
1644 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1732 1939
1733=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1734 1941
1735Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1736 1943
1737=item $player->ext_reply ($msgid, @msg)
1738
1739Sends an ext reply to the player.
1740
1741=cut
1742
1743sub ext_reply($$@) {
1744 my ($self, $id, @msg) = @_;
1745
1746 $self->ns->ext_reply ($id, @msg)
1747}
1748
1749=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1750 1945
1751Sends an ext event to the client. 1946Sends an ext event to the client.
1752 1947
1753=cut 1948=cut
1812sub generate_random_map { 2007sub generate_random_map {
1813 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1814 2009
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816 2011
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 2013}
1832 2014
1833=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1834 2016
1835Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1840 2022
1841sub register { 2023sub register {
1842 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 2025 my $pkg = caller;
1844 2026
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 2028
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 2030}
1850 2031
1862} 2043}
1863 2044
1864sub normalise { 2045sub normalise {
1865 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1866 2047
1867 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1868 2049
1869 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1870 2051
1871 # map plan: 2052 # map plan:
1872 # 2053 #
1887 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 2069 $path = "$base/$path";
1889 } 2070 }
1890 2071
1891 for ($path) { 2072 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1895 } 2075 }
1896 2076
1897 $path 2077 $path
1911 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1912 return $self; 2092 return $self;
1913 } 2093 }
1914 } 2094 }
1915 2095
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 2097 ()
1918} 2098}
1919 2099
2100# may re-bless or do other evil things
1920sub init { 2101sub init {
1921 my ($self) = @_; 2102 my ($self) = @_;
1922 2103
1923 $self 2104 $self
1924} 2105}
1989 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1990 2171
1991 1 2172 1
1992} 2173}
1993 2174
2175# used to laod the header of an original map
1994sub load_header_orig { 2176sub load_header_orig {
1995 my ($self) = @_; 2177 my ($self) = @_;
1996 2178
1997 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1998} 2180}
1999 2181
2182# used to laod the header of an instantiated map
2000sub load_header_temp { 2183sub load_header_temp {
2001 my ($self) = @_; 2184 my ($self) = @_;
2002 2185
2003 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2004} 2187}
2005 2188
2189# called after loading the header from an instantiated map
2006sub prepare_temp { 2190sub prepare_temp {
2007 my ($self) = @_; 2191 my ($self) = @_;
2008 2192
2009 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2010 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2011 # safety 2195 # safety
2012 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2013 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2014} 2198}
2015 2199
2200# called after loading the header from an original map
2016sub prepare_orig { 2201sub prepare_orig {
2017 my ($self) = @_; 2202 my ($self) = @_;
2018 2203
2019 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2020 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2044 2229
2045sub find; 2230sub find;
2046sub find { 2231sub find {
2047 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2048 2233
2234 cf::cede_to_tick;
2235
2049 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2050 2237
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2053 2240
2054 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2085 2272
2086 { 2273 {
2087 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2088 2275
2089 return unless $self->valid; 2276 return unless $self->valid;
2090 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2091
2092 $self->in_memory (cf::MAP_LOADING);
2093 2278
2094 $self->alloc; 2279 $self->alloc;
2095 2280
2096 $self->pre_load; 2281 $self->pre_load;
2097 cf::cede_to_tick; 2282 cf::cede_to_tick;
2098 2283
2284 if (exists $self->{load_path}) {
2099 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2100 $f->skip_block; 2286 $f->skip_block;
2101 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2102 or return; 2288 or return;
2103 2289
2104 $self->post_load_original 2290 $self->post_load_original
2105 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2106 2292
2107 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2108 utf8::encode $uniq; 2294 utf8::encode $uniq;
2109 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2110 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2111 $self->clear_unique_items; 2297 $self->clear_unique_items;
2112 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2113 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2114 } 2301 }
2115 } 2302 }
2116 }
2117 2303
2118 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2119 2311
2120 cf::cede_to_tick; 2312 cf::cede_to_tick;
2121 # now do the right thing for maps 2313 # now do the right thing for maps
2122 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2123 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2127 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2128 $self->decay_objects; 2320 $self->decay_objects;
2129 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2130 $self->update_buttons; 2322 $self->update_buttons;
2131 cf::cede_to_tick; 2323 cf::cede_to_tick;
2132 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2133 } 2325 }
2134 2326
2135 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2136 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2137
2138 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2329 }
2140 2330
2141 $self->post_load; 2331 $self->post_load;
2332
2333 1
2142} 2334}
2143 2335
2144# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2154# if $self->per_party; 2346# if $self->per_party;
2155 2347
2156 $self 2348 $self
2157} 2349}
2158 2350
2159# find and load all maps in the 3x3 area around a map
2160sub load_neighbours {
2161 my ($map) = @_;
2162
2163 my @neigh; # diagonal neighbours
2164
2165 for (0 .. 3) {
2166 my $neigh = $map->tile_path ($_)
2167 or next;
2168 $neigh = find $neigh, $map
2169 or next;
2170 $neigh->load;
2171
2172 # now find the diagonal neighbours
2173 push @neigh,
2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2176 }
2177
2178 for (grep defined $_->[0], @neigh) {
2179 my ($path, $origin) = @$_;
2180 my $neigh = find $path, $origin
2181 or next;
2182 $neigh->load;
2183 }
2184}
2185
2186sub find_sync { 2351sub find_sync {
2187 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2188 2353
2189 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2190} 2359}
2191 2360
2192sub do_load_sync { 2361sub do_load_sync {
2193 my ($map) = @_; 2362 my ($map) = @_;
2194 2363
2364 # it's a bug to call this from the main context
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2197 2367
2198 cf::sync_job { $map->load }; 2368 $map->load;
2199} 2369}
2200 2370
2201our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2203 2373
2204sub find_async { 2374sub find_async {
2205 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2206 2376
2207 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2208 2378
2209 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2211 } 2381 }
2212 2382
2213 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2214 2384
2215 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2274sub swap_out { 2444sub swap_out {
2275 my ($self) = @_; 2445 my ($self) = @_;
2276 2446
2277 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2278 2448
2279 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2280 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2281 return if $self->players; 2451 return if $self->players;
2282 2452
2283 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate; 2454 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2286 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2287 2457
2288 # then atomically save 2458 # then atomically save
2289 $self->_save; 2459 $self->_save;
2290 2460
2291 # then free the map 2461 # then free the map
2315 2485
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2487
2318 return if $self->players; 2488 return if $self->players;
2319 2489
2320 warn "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2321 2491
2322 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2323 2493
2324 # need to save uniques path 2494 # need to save uniques path
2325 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327 2497
2480 2650
2481Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2482 2652
2483=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2484 2654
2485returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2486even if the object actually exists. May block. 2656even if the object actually exists. May block.
2487 2657
2488=cut 2658=cut
2489 2659
2490sub deref { 2660sub deref {
2657 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2658 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2659 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2660 2830
2661 $map->load; 2831 $map->load;
2662 $map->load_neighbours;
2663 2832
2664 return unless $self->contr->active; 2833 return unless $self->contr->active;
2665 2834
2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667 if ($self->enter_map ($map, $x, $y)) { 2836 if ($self->enter_map ($map, $x, $y)) {
2690 2859
2691sub cf::object::player::goto { 2860sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2862
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2867 }
2699 2868
2700 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2723 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2724 } 2893 }
2725 } 2894 }
2726 2895
2727 my $map = eval { 2896 my $map = eval {
2728 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729 2898
2730 if ($map) { 2899 if ($map) {
2731 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2732 $map = $check->($map, $x, $y, $self) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2733 } else { 2902 } else {
2823 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2824 2993
2825 unless (eval { 2994 unless (eval {
2826 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2827 2996
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2837 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2839 3023
2840 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2841 3025
2842 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2848 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2852 3036
2853 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 3038 $self->leave_link;
2855 } 3039 }
2856 })->prio (1); 3040 })->prio (1);
2857} 3041}
2858 3042
3068=cut 3252=cut
3069 3253
3070sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
3071 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
3072 3256
3073 if ($self->extcmd == 2) {
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3075 } elsif ($self->extcmd == 1) { # TODO: remove
3076 push @msg, msgtype => "event_$type";
3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3078 }
3079}
3080
3081=item $client->ext_reply ($msgid, @msg)
3082
3083Sends an ext reply to the client.
3084
3085=cut
3086
3087sub cf::client::ext_reply($$@) {
3088 my ($self, $id, @msg) = @_;
3089
3090 if ($self->extcmd == 2) {
3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092 } elsif ($self->extcmd == 1) {
3093 #TODO: version 1, remove
3094 unshift @msg, msgtype => "reply", msgid => $id;
3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096 }
3097} 3258}
3098 3259
3099=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
3100 3261
3101Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
3156 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
3157 3318
3158 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159 3320
3160 if (ref $msg) { 3321 if (ref $msg) {
3161 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162 "ARRAY" eq ref $msg
3163 ? @$msg
3164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165 3323
3166 my @reply;
3167
3168 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3169 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3170 } 3342 }
3171
3172 $ns->ext_reply ($reply, @reply)
3173 if $reply;
3174
3175 } else { 3343 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3345 }
3178 3346
3179 cf::override; 3347 cf::override;
3180 }, 3348 },
3181); 3349);
3262 decrease split destroy change_exp value msg lore send_msg)], 3430 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3431 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3432 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3433 ["cf::map" => qw(trigger)],
3266) { 3434) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3435 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3436 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3437 for @funs;
3271} 3438}
3272 3439
3311 local @cf::_safe_eval_args = values %vars; 3478 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3479 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3480 }
3314 3481
3315 if ($@) { 3482 if ($@) {
3316 warn "$@"; 3483 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3484 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3485 "with arguments " . (join " ", %vars) . "\n";
3319 } 3486 }
3320 3487
3321 wantarray ? @res : $res[0] 3488 wantarray ? @res : $res[0]
3322} 3489}
3323 3490
3348=cut 3515=cut
3349 3516
3350############################################################################# 3517#############################################################################
3351# the server's init and main functions 3518# the server's init and main functions
3352 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3353sub load_facedata($) { 3597sub load_facedata($) {
3354 my ($path) = @_; 3598 my ($path) = @_;
3355 3599
3356 # HACK to clear player env face cache, we need some signal framework
3357 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3359
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3601
3362 warn "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3363 3603
3364 my $facedata; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3365 0 < aio_load $path, $facedata
3366 or die "$path: $!";
3367
3368 $facedata = Coro::Storable::thaw $facedata;
3369 3605
3370 $facedata->{version} == 2 3606 $facedata->{version} == 2
3371 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3372 3608
3373 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3375 $facedata->{resource}{"res/exp_table"} = { 3611
3376 type => FT_RSRC, 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3377 data => $exp_table, 3613
3378 hash => (Digest::MD5::md5 $exp_table), 3614 # BEGIN ATOMIC
3379 }; 3615 # from here on, everything must be atomic - no thread switch allowed
3380 cf::cede_to_tick; 3616 my $t1 = EV::time;
3381 3617
3382 { 3618 {
3383 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3384 3620
3385 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3386 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387 3624
3388 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3392 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3393 cf::cede_to_tick; 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3631 delete $cf::face::META[$idx];
3394 } 3632 }
3395 3633
3396 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3397 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3398 3636
3401 3639
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3640 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3643 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3645 }
3408
3409 cf::cede_to_tick;
3410 } 3646 }
3411 } 3647 }
3412 3648
3413 { 3649 {
3414 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3415 3651
3416 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3417 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3418 cf::cede_to_tick;
3419 } 3654 }
3420 3655
3421 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3422 } 3657 }
3423 3658
3424 { 3659 {
3425 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3426 3661
3427 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3428 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3666
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3433 } else { 3673 } else {
3434 $RESOURCE{$name} = $info; 3674# $RESOURCE{$name} = $info; # unused
3435 } 3675 }
3436
3437 cf::cede_to_tick;
3438 } 3676 }
3439 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3440 3688
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3690
3691 aio_close $fh if $fh; # close old facedata
3692
3443 1 3693 1
3444} 3694}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3695
3466register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3697 my ($ns, $want) = @_;
3468 3698
3469 while (my ($k, $v) = each %$want) { 3699 while (my ($k, $v) = each %$want) {
3477 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3479 cf::arch::commit_load; 3709 cf::arch::commit_load;
3480 3710
3481 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3482} 3726}
3483 3727
3484sub reload_regions { 3728sub reload_regions {
3485 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3486 # for this (global event?) 3730 # for this (global event?)
3494 if exists $_->{match}; 3738 if exists $_->{match};
3495 } 3739 }
3496} 3740}
3497 3741
3498sub reload_facedata { 3742sub reload_facedata {
3499 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3500 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3501} 3745}
3502 3746
3503sub reload_archetypes { 3747sub reload_archetypes {
3504 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3505 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3506} 3762}
3507 3763
3508sub reload_treasures { 3764sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3511} 3767}
3512 3768
3769sub reload_sound {
3770 trace "loading sound config from $DATADIR/sound\n";
3771
3772 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3773
3774 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3775 my $sound = $soundconf->{compat}[$_]
3776 or next;
3777
3778 my $face = cf::face::find "sound/$sound->[1]";
3779 cf::sound::set $sound->[0] => $face;
3780 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3781 }
3782
3783 while (my ($k, $v) = each %{$soundconf->{event}}) {
3784 my $face = cf::face::find "sound/$v";
3785 cf::sound::set $k => $face;
3786 }
3787}
3788
3513sub reload_resources { 3789sub reload_resources {
3514 warn "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3515 3791
3792 reload_materials;
3516 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3795 reload_sound;
3517 reload_archetypes; 3796 reload_archetypes;
3518 reload_regions; 3797 reload_regions;
3519 reload_treasures; 3798 reload_treasures;
3520 3799
3521 warn "finished reloading resource files\n"; 3800 trace "finished reloading resource files\n";
3522} 3801}
3523 3802
3524sub reload_config { 3803sub reload_config {
3525 warn "reloading config file...\n"; 3804 trace "reloading config file...\n";
3526 3805
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3806 my $config = load_file "$CONFDIR/config";
3528 or return; 3807 utf8::decode $config;
3529 3808 *CFG = decode_yaml $config;
3530 local $/;
3531 *CFG = YAML::XS::Load scalar <$fh>;
3532 3809
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3810 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3811
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3812 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3813 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3817 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3818 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3819 };
3543 warn $@ if $@; 3820 warn $@ if $@;
3544 } 3821 }
3545
3546 warn "finished reloading resource files\n";
3547} 3822}
3548 3823
3549sub pidfile() { 3824sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3825 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3826 or die "$PIDFILE: $!";
3564 seek $fh, 0, 0; 3839 seek $fh, 0, 0;
3565 print $fh $$; 3840 print $fh $$;
3566} 3841}
3567 3842
3568sub main_loop { 3843sub main_loop {
3569 warn "EV::loop starting\n"; 3844 trace "EV::loop starting\n";
3570 if (1) { 3845 if (1) {
3571 EV::loop; 3846 EV::loop;
3572 } 3847 }
3573 warn "EV::loop returned\n"; 3848 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3849 goto &main_loop unless $REALLY_UNLOOP;
3575} 3850}
3576 3851
3577sub main { 3852sub main {
3578 cf::init_globals; # initialise logging 3853 cf::init_globals; # initialise logging
3579 3854
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3859
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3861
3587 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3588 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3590 (async { 3865 (async {
3591 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3592 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3593 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3594 }; 3869 };
3595 3870
3596 evthread_start IO::AIO::poll_fileno; 3871 evthread_start IO::AIO::poll_fileno;
3597 3872
3598 cf::sync_job { 3873 cf::sync_job {
3599 cf::init_experience; 3874 cf::incloader::init ();
3875
3876 db_init;
3877
3600 cf::init_anim; 3878 cf::init_anim;
3601 cf::init_attackmess; 3879 cf::init_attackmess;
3602 cf::init_dynamic; 3880 cf::init_dynamic;
3603 3881
3604 cf::load_settings; 3882 cf::load_settings;
3605 cf::load_materials;
3606 3883
3607 reload_resources; 3884 reload_resources;
3608 reload_config; 3885 reload_config;
3609 db_init;
3610 3886
3611 cf::init_uuid; 3887 cf::init_uuid;
3612 cf::init_signals; 3888 cf::init_signals;
3613 cf::init_skills; 3889 cf::init_skills;
3614 3890
3622 3898
3623 # no (long-running) fork's whatsoever before this point(!) 3899 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3900 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3901 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3902
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3903 cf::_post_init 0;
3628 }; 3904 };
3629 3905
3630 cf::object::thawer::errors_are_fatal 0; 3906 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3907 info "parse errors in files are no longer fatal from this point on.\n";
3632 3908
3909 AE::postpone {
3910 undef &main; # free gobs of memory :)
3911 };
3912
3633 main_loop; 3913 goto &main_loop;
3634} 3914}
3635 3915
3636############################################################################# 3916#############################################################################
3637# initialisation and cleanup 3917# initialisation and cleanup
3638 3918
3677 or return; 3957 or return;
3678 3958
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3959 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3960 and return;
3681 3961
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3962 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3963
3684 1 3964 1
3685} 3965}
3686 3966
3687our $uuid_lock; 3967our $uuid_lock;
3699 or return; 3979 or return;
3700 3980
3701 my $value = uuid_seq uuid_cur; 3981 my $value = uuid_seq uuid_cur;
3702 3982
3703 unless ($value) { 3983 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3984 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3985 return;
3706 } 3986 }
3707 3987
3708 my $value = uuid_str $value + $uuid_skip; 3988 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3989 $uuid_skip = 0;
3719 or return; 3999 or return;
3720 4000
3721 aio_rename "$uuid~", $uuid 4001 aio_rename "$uuid~", $uuid
3722 and return; 4002 and return;
3723 4003
3724 warn "uuid file written ($value).\n"; 4004 trace "uuid file written ($value).\n";
3725 4005
3726 1 4006 1
3727 4007
3728} 4008}
3729 4009
3735} 4015}
3736 4016
3737sub emergency_save() { 4017sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 4018 my $freeze_guard = cf::freeze_mainloop;
3739 4019
3740 warn "emergency_perl_save: enter\n"; 4020 info "emergency_perl_save: enter\n";
4021
4022 # this is a trade-off: we want to be very quick here, so
4023 # save all maps without fsync, and later call a global sync
4024 # (which in turn might be very very slow)
4025 local $USE_FSYNC = 0;
3741 4026
3742 cf::sync_job { 4027 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 4028 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 4029
3748 # use a peculiar iteration method to avoid tripping on perl 4030 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 4031 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 4032 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 4033 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 4034 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 4035 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 4036 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4037 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 4038 $pl->save;
3757 } 4039 }
3758 warn "emergency_perl_save: end player save\n"; 4040 info "emergency_perl_save: end player save\n";
3759 4041
4042 cf::write_runtime_sync; # external watchdog should not bark
4043
3760 warn "emergency_perl_save: begin map save\n"; 4044 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 4045 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 4046 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 4047 $map->valid or next;
3764 $map->save; 4048 $map->save;
3765 } 4049 }
3766 warn "emergency_perl_save: end map save\n"; 4050 info "emergency_perl_save: end map save\n";
3767 4051
4052 cf::write_runtime_sync; # external watchdog should not bark
4053
3768 warn "emergency_perl_save: begin database checkpoint\n"; 4054 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 4055 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 4056 info "emergency_perl_save: end database checkpoint\n";
3771 4057
3772 warn "emergency_perl_save: begin write uuid\n"; 4058 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 4059 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 4060 info "emergency_perl_save: end write uuid\n";
4061
4062 cf::write_runtime_sync; # external watchdog should not bark
4063
4064 trace "emergency_perl_save: syncing database to disk";
4065 BDB::db_env_txn_checkpoint $DB_ENV;
4066
4067 info "emergency_perl_save: starting sync\n";
4068 IO::AIO::aio_sync sub {
4069 info "emergency_perl_save: finished sync\n";
4070 };
4071
4072 cf::write_runtime_sync; # external watchdog should not bark
4073
4074 trace "emergency_perl_save: flushing outstanding aio requests";
4075 while (IO::AIO::nreqs || BDB::nreqs) {
4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4077 }
4078
4079 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 4080 };
3776 4081
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 4082 info "emergency_perl_save: leave\n";
3783} 4083}
3784 4084
3785sub post_cleanup { 4085sub post_cleanup {
3786 my ($make_core) = @_; 4086 my ($make_core) = @_;
3787 4087
4088 IO::AIO::flush;
4089
3788 warn Carp::longmess "post_cleanup backtrace" 4090 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 4091 if $make_core;
3790 4092
3791 my $fh = pidfile; 4093 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 4094 unlink $PIDFILE if <$fh> == $$;
3793} 4095}
3817 } 4119 }
3818} 4120}
3819 4121
3820sub do_reload_perl() { 4122sub do_reload_perl() {
3821 # can/must only be called in main 4123 # can/must only be called in main
3822 if (in_main) { 4124 unless (in_main) {
3823 warn "can only reload from main coroutine"; 4125 error "can only reload from main coroutine";
3824 return; 4126 return;
3825 } 4127 }
3826 4128
3827 return if $RELOAD++; 4129 return if $RELOAD++;
3828 4130
3829 my $t1 = AE::time; 4131 my $t1 = AE::time;
3830 4132
3831 while ($RELOAD) { 4133 while ($RELOAD) {
3832 warn "reloading..."; 4134 cf::get_slot 0.1, -1, "reload_perl";
4135 info "perl_reload: reloading...";
3833 4136
3834 warn "entering sync_job"; 4137 trace "perl_reload: entering sync_job";
3835 4138
3836 cf::sync_job { 4139 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 4140 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 4141
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 4142 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 4143 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 4144 %EXT_CORO = ();
3854 4145
3855 warn "removing commands"; 4146 trace "perl_reload: removing commands";
3856 %COMMAND = (); 4147 %COMMAND = ();
3857 4148
3858 warn "removing ext/exti commands"; 4149 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 4150 %EXTCMD = ();
3860 %EXTICMD = (); 4151 %EXTICMD = ();
3861 4152
3862 warn "unloading/nuking all extensions"; 4153 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 4154 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 4155 trace "... unloading $pkg";
3865 4156
3866 if (my $cb = $pkg->can ("unload")) { 4157 if (my $cb = $pkg->can ("unload")) {
3867 eval { 4158 eval {
3868 $cb->($pkg); 4159 $cb->($pkg);
3869 1 4160 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 4161 } or error "$pkg unloaded, but with errors: $@";
3871 } 4162 }
3872 4163
3873 warn "... clearing $pkg"; 4164 trace "... clearing $pkg";
3874 clear_package $pkg; 4165 clear_package $pkg;
3875 } 4166 }
3876 4167
3877 warn "unloading all perl modules loaded from $LIBDIR"; 4168 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 4169 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 4171
3881 warn "... unloading $k"; 4172 trace "... unloading $k";
3882 delete $INC{$k}; 4173 delete $INC{$k};
3883 4174
3884 $k =~ s/\.pm$//; 4175 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 4176 $k =~ s/\//::/g;
3886 4177
3889 } 4180 }
3890 4181
3891 clear_package $k; 4182 clear_package $k;
3892 } 4183 }
3893 4184
3894 warn "getting rid of safe::, as good as possible"; 4185 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 4186 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4187 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 4188
3898 warn "unloading cf.pm \"a bit\""; 4189 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 4190 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4191 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 4192
3902 # don't, removes xs symbols, too, 4193 # don't, removes xs symbols, too,
3903 # and global variables created in xs 4194 # and global variables created in xs
3904 #clear_package __PACKAGE__; 4195 #clear_package __PACKAGE__;
3905 4196
3906 warn "unload completed, starting to reload now"; 4197 info "perl_reload: unload completed, starting to reload now";
3907 4198
3908 warn "reloading cf.pm"; 4199 trace "perl_reload: reloading cf.pm";
3909 require cf; 4200 require cf;
3910 cf::_connect_to_perl_1; 4201 cf::_connect_to_perl_1;
3911 4202
3912 warn "loading config and database again"; 4203 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 4204 cf::reload_config;
3914 4205
3915 warn "loading extensions"; 4206 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 4207 cf::load_extensions;
3917 4208
3918 if ($REATTACH_ON_RELOAD) { 4209 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 4210 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 4211 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 4212 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 4213 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 4214 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 4215 reattach $_ for values %PLAYER;
3925 } 4216 }
3926 4217
3927 warn "running post_init jobs"; 4218 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 4219
3930 warn "leaving sync_job"; 4220 trace "perl_reload: leaving sync_job";
3931 4221
3932 1 4222 1
3933 } or do { 4223 } or do {
3934 warn $@; 4224 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4225 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4226 };
3937 4227
3938 warn "reloaded";
3939 --$RELOAD; 4228 --$RELOAD;
3940 } 4229 }
3941 4230
3942 $t1 = AE::time - $t1; 4231 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4232 info "perl_reload: completed in ${t1}s\n";
3944}; 4233};
3945 4234
3946our $RELOAD_WATCHER; # used only during reload 4235our $RELOAD_WATCHER; # used only during reload
3947 4236
3948sub reload_perl() { 4237sub reload_perl() {
3969 reload_perl; 4258 reload_perl;
3970 }; 4259 };
3971 } 4260 }
3972}; 4261};
3973 4262
3974unshift @INC, $LIBDIR; 4263#############################################################################
3975 4264
3976my $bug_warning = 0; 4265my $bug_warning = 0;
3977 4266
3978our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN;
3980
3981sub wait_for_tick { 4267sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983 4269
3984 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
3985 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait;
3987} 4271}
3988 4272
3989sub wait_for_tick_begin { 4273sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991 4275
3992 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4278 $signal->wait;
3995} 4279}
3999 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
4001 return; 4285 return;
4002 } 4286 }
4003 4287
4004 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4005 4289
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007 4291
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4294 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4295 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4296 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4297 or error "ERROR: unable to write runtime file: $!";
4014 }; 4298 };
4015 } 4299 }
4016 4300
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4302 $sig->send;
4019 } 4303 }
4020 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
4021 $sig->send;
4022 }
4023 4305
4024 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
4025 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026 4308
4027 if (0) { 4309 if (0) {
4028 if ($NEXT_TICK) { 4310 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4311 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4312 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4313 debug "jitter $JITTER\n";#d#
4032 } 4314 }
4033 } 4315 }
4034} 4316}
4035 4317
4036{ 4318{
4037 # configure BDB 4319 # configure BDB
4320 info "initialising database";
4038 4321
4039 BDB::min_parallel 16; 4322 BDB::min_parallel 16;
4040 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
4041 $AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
4042 4325
4043 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
4044 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4071 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4072 }; 4355 };
4073 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4074 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4075 }; 4358 };
4359
4360 info "database initialised";
4076} 4361}
4077 4362
4078{ 4363{
4079 # configure IO::AIO 4364 # configure IO::AIO
4080 4365
4366 info "initialising aio";
4081 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
4084} 4371}
4085 4372
4086my $_log_backtrace; 4373our $_log_backtrace;
4374our $_log_backtrace_last;
4087 4375
4088sub _log_backtrace { 4376sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4377 my ($msg, @addr) = @_;
4090 4378
4091 $msg =~ s/\n//; 4379 $msg =~ s/\n$//;
4092 4380
4381 if ($_log_backtrace_last eq $msg) {
4382 LOG llevInfo, "[ABT] $msg\n";
4383 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4384 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4385 } elsif ($_log_backtrace < 2) {
4386 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4387 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4388 my $perl_bt = Carp::longmess $msg;
4097 async { 4389 async {
4098 $Coro::current->{desc} = "abt $msg"; 4390 $Coro::current->{desc} = "abt $msg";
4099 4391
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4411 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4412 --$_log_backtrace;
4121 }; 4413 };
4122 } else { 4414 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4415 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4416 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4417 }
4126} 4418}
4127 4419
4128# load additional modules 4420# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4421require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines