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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines