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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 4000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
115 124
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 127our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 133our $DB_ENV;
125 134
126our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 136
128our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 139
130our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
132our $NOW; 143our $NOW;
133 144
134our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
145 156
146our @POST_INIT; 157our @POST_INIT;
147 158
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
150 164
151binmode STDOUT; 165binmode STDOUT;
152binmode STDERR; 166binmode STDERR;
153 167
154# read virtual server time, if available 168# read virtual server time, if available
… …
165 179
166our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
167 181
168sub cf::map::normalise; 182sub cf::map::normalise;
169 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
170############################################################################# 188#############################################################################
171 189
172%REFLECT = (); 190%REFLECT = ();
173for (@REFLECT) { 191for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
184 202
185=over 4 203=over 4
186 204
187=item $cf::UPTIME 205=item $cf::UPTIME
188 206
189The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
190 223
191=item $cf::RUNTIME 224=item $cf::RUNTIME
192 225
193The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
194every server tick. 227every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
203database environment. 236database environment.
204 237
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 238=item $cf::LOADAVG
214 239
215The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
216(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
217objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 251from wherever your confdir points to.
227 252
228=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
229 254
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
233 275
234=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
235 277
236This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 287
246=back 288=back
247 289
248=cut 290=cut
249 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
250$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 299 my $msg = join "", @_;
252 300
253 $msg .= "\n" 301 $msg .= "\n"
254 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
255 303
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 305
258 LOG llevError, $msg; 306 LOG llevWarn, $msg;
259}; 307};
260 308
261$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
263 311
264 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
265 313
266 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 316 return;#d#
269 }#d# 317 }#d#
270 318
271 # kill coroutine otherwise 319 # kill coroutine otherwise
272 Coro::terminate 320 Coro::terminate
… …
292)) { 340)) {
293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294} 342}
295 343
296$EV::DIED = sub { 344$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
298}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
299 352
300############################################################################# 353#############################################################################
301 354
302=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
303 356
… …
324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325 $d 378 $d
326 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
327} 380}
328 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
329=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
330 435
331Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
332 437
333=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 445
341sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
343 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
344=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
345 481
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
348 484
349The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 486is a reload or not.
351 487
352=cut 488=cut
353 489
354sub post_init(&) { 490sub post_init(&) {
355 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
356} 509}
357 510
358=item cf::lock_wait $string 511=item cf::lock_wait $string
359 512
360Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
399} 552}
400 553
401=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
402 555
403Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over timer. 557get spread over time.
405 558
406=cut 559=cut
407 560
408sub periodic($$) { 561sub periodic($$) {
409 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
… …
413 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
414} 567}
415 568
416=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
417 570
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
421 578
422The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
424 581
425Useful for short background jobs. 582Useful for short background jobs.
… …
454 } 611 }
455 } 612 }
456 613
457 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
459 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 617 } else {
462 $busy = 0; 618 $busy = 0;
463 Coro::schedule; 619 Coro::schedule;
464 } 620 }
465 } 621 }
… …
505=cut 661=cut
506 662
507sub sync_job(&) { 663sub sync_job(&) {
508 my ($job) = @_; 664 my ($job) = @_;
509 665
510 if ($Coro::current == $Coro::main) { 666 if (in_main) {
511 my $time = AE::time; 667 my $time = AE::time;
512 668
513 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
515 671
516 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
517 673
518 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
519 675
520 my $busy = 1; 676 my $busy = 1;
521 my @res; 677 my @res;
522 678
523 (async { 679 (async {
524 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 681 @res = eval { $job->() };
526 warn $@ if $@; 682 error $@ if $@;
527 undef $busy; 683 undef $busy;
528 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
529 685
530 while ($busy) { 686 while ($busy) {
531 if (Coro::nready) { 687 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
566 722
567 $coro 723 $coro
568} 724}
569 725
570=item fork_call { }, $args 726=item fork_call { }, @args
571 727
572Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 731never block itself or use any form of event handling.
576 732
577=cut 733=cut
578 734
735sub post_fork {
736 reset_signals;
737}
738
579sub fork_call(&@) { 739sub fork_call(&@) {
580 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
581 741
582 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
585 745
586 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
587 reset_signals; 747 cf::post_fork;
588 &$cb 748 &$cb
589 }, @args; 749 } @args;
590 750
591 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
592} 763}
593 764
594=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
595 766
596=cut 767=cut
… …
633within each server. 804within each server.
634 805
635=cut 806=cut
636 807
637sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
638 my ($name) = @_; 812 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
640 814
641 eval { 815 eval {
642 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
652} 826}
653 827
654our $DB; 828our $DB;
655 829
656sub db_init { 830sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
659 };
660} 832}
661 833
662sub db_get($$) { 834sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
664 836
665 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
666 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
667 841
668 $! ? () 842 $! ? ()
669 : $data 843 : $data
670 }
671} 844}
672 845
673sub db_put($$$) { 846sub db_put($$$) {
674 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
703 876
704 my @data; 877 my @data;
705 my $md5; 878 my $md5;
706 879
707 for (0 .. $#$src) { 880 for (0 .. $#$src) {
708 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
709 or Carp::croak "$src->[$_]: $!";
710 } 882 }
711 883
712 # if processing is expensive, check 884 # if processing is expensive, check
713 # checksum first 885 # checksum first
714 if (1) { 886 if (1) {
… …
731 903
732 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
733 my $data = $process->(\@data); 905 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
735 907
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 909
738 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
741 913
… …
751 923
752=cut 924=cut
753 925
754sub datalog($@) { 926sub datalog($@) {
755 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 929}
758 930
759=back 931=back
760 932
761=cut 933=cut
… …
956 1128
957 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1131
960 } elsif (ref $type) { 1132 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
962 1134
963 } else { 1135 } else {
964 shift @arg; 1136 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
966 } 1138 }
967 } 1139 }
968} 1140}
969 1141
970sub _object_attach { 1142sub _object_attach {
… …
980 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
981 } 1153 }
982 1154
983 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
984 } else { 1156 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1158 }
987 1159
988 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
989} 1161}
990 1162
… …
1049 1221
1050 for (@$callbacks) { 1222 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1052 1224
1053 if ($@) { 1225 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1227 override;
1057 } 1228 }
1058 1229
1059 return 1 if $override; 1230 return 1 if $override;
1060 } 1231 }
… …
1139 for (@$attach) { 1310 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1142 } 1313 }
1143 } else { 1314 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1316 }
1146 } 1317 }
1147} 1318}
1148 1319
1149cf::attachable->attach ( 1320cf::attachable->attach (
… …
1176 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1177 1348
1178 sync_job { 1349 sync_job {
1179 if (length $$rdata) { 1350 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1183 1355
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1209 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1210 1382
1211 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1385 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1215 } 1387 }
1216 } else { 1388 } else {
1217 aio_unlink $filename; 1389 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1219 } 1391 }
… …
1243 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1416 $av = $st->{objs};
1245 } 1417 }
1246 1418
1247 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1250 1423
1251 ($data, $av) 1424 ($data, $av)
1252} 1425}
1253 1426
1254=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1331 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1332 1505
1333 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1334 1507
1335 if (ref $msg) { 1508 if (ref $msg) {
1336 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1337 "ARRAY" eq ref $msg
1338 ? @$msg
1339 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1340 1510
1341 my @reply; 1511 my @reply;
1342 1512
1343 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1344 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1346 1516
1347 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1348 if $reply; 1518 if $reply;
1349 1519
1350 } else { 1520 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1522 }
1353 1523
1354 cf::override; 1524 cf::override;
1355 }, 1525 },
1356); 1526);
… …
1366 }; 1536 };
1367 1537
1368 $grp 1538 $grp
1369} 1539}
1370 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1371sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1372 cf::sync_job { 1557 cf::sync_job {
1373 my %todo; 1558 my %todo;
1374 1559
1375 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1561 next unless -r $path;
… …
1394 1579
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1582
1398 $ext{source} = 1583 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1401 . $source 1586 . $source
1402 . "\n};\n1"; 1587 . "\n};\n1";
1403 1588
1404 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1416 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1602 next ext
1418 unless exists $done{$_}; 1603 unless exists $done{$_};
1419 } 1604 }
1420 1605
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1423 my $active = eval $v->{source}; 1617 my $active = eval $source;
1424 1618
1425 if (length $@) { 1619 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1427 1621
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1624
1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1430 } else { 1627 } else {
1431 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1433 $progress = 1; 1630 $progress = 1;
1434 1631
1435 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1633 unless $active;
1437 } 1634 }
1438 } 1635 }
1439 1636
1440 unless ($progress) { 1637 unless ($progress) {
… …
1442 1639
1443 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1446 } 1643 }
1644
1645 last;
1447 } 1646 }
1448 } 1647 }
1449 }; 1648 };
1450} 1649}
1451 1650
… …
1609 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1610 1809
1611 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1613 1812
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1814 $pl->deactivate;
1815
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1619 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1620 1821
1621 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1677 \@logins 1878 \@logins
1678} 1879}
1679 1880
1680=item $player->maps 1881=item $player->maps
1681 1882
1883=item cf::player::maps $login
1884
1682Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1683player. May block. 1886player. May block.
1684 1887
1685=cut 1888=cut
1686 1889
… …
1748=cut 1951=cut
1749 1952
1750sub find_by_path($) { 1953sub find_by_path($) {
1751 my ($path) = @_; 1954 my ($path) = @_;
1752 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1753 my ($match, $specificity); 1958 my ($match, $specificity);
1754 1959
1755 for my $region (list) { 1960 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1757 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
… …
1785sub generate_random_map { 1990sub generate_random_map {
1786 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1787 1992
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789 1994
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 1996}
1805 1997
1806=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1807 1999
1808Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1813 2005
1814sub register { 2006sub register {
1815 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 2008 my $pkg = caller;
1817 2009
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 2011
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 2013}
1823 2014
1824# also paths starting with '/' 2015# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 2017
1827sub thawer_merge { 2018sub thawer_merge {
1828 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1829 2020
1830 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
… …
1835} 2026}
1836 2027
1837sub normalise { 2028sub normalise {
1838 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1839 2030
1840 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1841 2032
1842 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1843 2034
1844 # map plan: 2035 # map plan:
1845 # 2036 #
… …
1860 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 2052 $path = "$base/$path";
1862 } 2053 }
1863 2054
1864 for ($path) { 2055 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1868 } 2058 }
1869 2059
1870 $path 2060 $path
… …
1884 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1885 return $self; 2075 return $self;
1886 } 2076 }
1887 } 2077 }
1888 2078
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 2080 ()
1891} 2081}
1892 2082
2083# may re-bless or do other evil things
1893sub init { 2084sub init {
1894 my ($self) = @_; 2085 my ($self) = @_;
1895 2086
1896 $self 2087 $self
1897} 2088}
… …
1962 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1963 2154
1964 1 2155 1
1965} 2156}
1966 2157
2158# used to laod the header of an original map
1967sub load_header_orig { 2159sub load_header_orig {
1968 my ($self) = @_; 2160 my ($self) = @_;
1969 2161
1970 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1971} 2163}
1972 2164
2165# used to laod the header of an instantiated map
1973sub load_header_temp { 2166sub load_header_temp {
1974 my ($self) = @_; 2167 my ($self) = @_;
1975 2168
1976 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1977} 2170}
1978 2171
2172# called after loading the header from an instantiated map
1979sub prepare_temp { 2173sub prepare_temp {
1980 my ($self) = @_; 2174 my ($self) = @_;
1981 2175
1982 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1983 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1984 # safety 2178 # safety
1985 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1986 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1987} 2181}
1988 2182
2183# called after loading the header from an original map
1989sub prepare_orig { 2184sub prepare_orig {
1990 my ($self) = @_; 2185 my ($self) = @_;
1991 2186
1992 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1993 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2017 2212
2018sub find; 2213sub find;
2019sub find { 2214sub find {
2020 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2021 2216
2217 cf::cede_to_tick;
2218
2022 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2023 2220
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2026 2223
2027 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2058 2255
2059 { 2256 {
2060 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2061 2258
2062 return unless $self->valid; 2259 return unless $self->valid;
2063 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2064
2065 $self->in_memory (cf::MAP_LOADING);
2066 2261
2067 $self->alloc; 2262 $self->alloc;
2068 2263
2069 $self->pre_load; 2264 $self->pre_load;
2070 cf::cede_to_tick; 2265 cf::cede_to_tick;
2071 2266
2267 if (exists $self->{load_path}) {
2072 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block; 2269 $f->skip_block;
2074 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2075 or return; 2271 or return;
2076 2272
2077 $self->post_load_original 2273 $self->post_load_original
2078 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2079 2275
2080 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2081 utf8::encode $uniq; 2277 utf8::encode $uniq;
2082 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2084 $self->clear_unique_items; 2280 $self->clear_unique_items;
2085 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2087 } 2284 }
2088 } 2285 }
2089 }
2090 2286
2091 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2092 2294
2093 cf::cede_to_tick; 2295 cf::cede_to_tick;
2094 # now do the right thing for maps 2296 # now do the right thing for maps
2095 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2096 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2100 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2101 $self->decay_objects; 2303 $self->decay_objects;
2102 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2103 $self->update_buttons; 2305 $self->update_buttons;
2104 cf::cede_to_tick; 2306 cf::cede_to_tick;
2105 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2106 } 2308 }
2107 2309
2108 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2109 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2110
2111 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2312 }
2113 2313
2114 $self->post_load; 2314 $self->post_load;
2315
2316 1
2115} 2317}
2116 2318
2117# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2127# if $self->per_party; 2329# if $self->per_party;
2128 2330
2129 $self 2331 $self
2130} 2332}
2131 2333
2132# find and load all maps in the 3x3 area around a map
2133sub load_neighbours {
2134 my ($map) = @_;
2135
2136 my @neigh; # diagonal neighbours
2137
2138 for (0 .. 3) {
2139 my $neigh = $map->tile_path ($_)
2140 or next;
2141 $neigh = find $neigh, $map
2142 or next;
2143 $neigh->load;
2144
2145 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 }
2149
2150 for (grep defined $_->[0], @neigh) {
2151 my ($path, $origin) = @$_;
2152 my $neigh = find $path, $origin
2153 or next;
2154 $neigh->load;
2155 }
2156}
2157
2158sub find_sync { 2334sub find_sync {
2159 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2160 2336
2161 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2162} 2342}
2163 2343
2164sub do_load_sync { 2344sub do_load_sync {
2165 my ($map) = @_; 2345 my ($map) = @_;
2166 2346
2347 # it's a bug to call this from the main context
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2169 2350
2170 cf::sync_job { $map->load }; 2351 $map->load;
2171} 2352}
2172 2353
2173our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2175 2356
2176sub find_async { 2357sub find_async {
2177 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2178 2359
2179 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2180 2361
2181 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2183 } 2364 }
2184 2365
2185 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2186 2367
2187 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2201 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2202 2383
2203 () 2384 ()
2204} 2385}
2205 2386
2387# common code, used by both ->save and ->swapout
2206sub save { 2388sub _save {
2207 my ($self) = @_; 2389 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2390
2211 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2212 2392
2213 return unless $self->dirty; 2393 return unless $self->dirty;
2214 2394
… …
2234 } else { 2414 } else {
2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2236 } 2416 }
2237} 2417}
2238 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2239sub swap_out { 2427sub swap_out {
2240 my ($self) = @_; 2428 my ($self) = @_;
2241 2429
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2247 return if $self->players; 2434 return if $self->players;
2248 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2249 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2250 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2251 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2252 2486
2253 $self->deactivate; 2487 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2489 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2490
2301 $self->unlink_save; 2491 $self->unlink_save;
2302 $self->destroy; 2492 $self->destroy;
2303} 2493}
2304 2494
… …
2312 2502
2313 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2314 2504
2315 $self->unlink_save; 2505 $self->unlink_save;
2316 2506
2317 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2512
… …
2552 2742
2553Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2554 2744
2555The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2556for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2558map. 2748map.
2559 2749
2560Will never block. 2750Will never block.
2561 2751
2562=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2583sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2584 my ($self) = @_; 2774 my ($self) = @_;
2585 2775
2586 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2587 2777
2778 ++$self->{_link_recursion};
2779
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2781
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2592 2784
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2786}
2595 2787
2596sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2598 2790
… …
2618 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2619 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2620 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2621 2813
2622 $map->load; 2814 $map->load;
2623 $map->load_neighbours;
2624 2815
2625 return unless $self->contr->active; 2816 return unless $self->contr->active;
2626 2817
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2629 2820 # entering was successful
2821 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2823 $self->activate_recursive;
2632} 2824 }
2633 2825
2826}
2827
2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2635 2829
2636Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2637her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2638that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2639the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
… …
2646 2840
2647our $GOTOGEN; 2841our $GOTOGEN;
2648 2842
2649sub cf::object::player::goto { 2843sub cf::object::player::goto {
2650 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2651 2851
2652 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2854
2655 $self->enter_link; 2855 $self->enter_link;
… …
2675 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2676 } 2876 }
2677 } 2877 }
2678 2878
2679 my $map = eval { 2879 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681 2881
2682 if ($map) { 2882 if ($map) {
2683 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2885 } else {
2686 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2687 } 2887 }
2688 2888
2689 $map 2889 $map
… …
2697 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2700 } 2900 }
2701 2901
2702 $done->() if $done; 2902 $done->($self) if $done;
2703 })->prio (1); 2903 })->prio (1);
2704} 2904}
2705 2905
2706=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2707 2907
… …
2775 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2776 2976
2777 unless (eval { 2977 unless (eval {
2778 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2779 2979
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2789 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2791 3006
2792 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2793 3008
2794 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2800 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2802 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2804 3019
2805 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 3021 $self->leave_link;
2807 } 3022 }
2808 })->prio (1); 3023 })->prio (1);
2809} 3024}
2810 3025
… …
3037=cut 3252=cut
3038 3253
3039sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3040 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3041 3256
3042 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3044 } elsif ($self->extcmd == 1) {
3045 #TODO: version 1, remove
3046 unshift @msg, msgtype => "reply", msgid => $id;
3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3048 }
3049} 3260}
3050 3261
3051=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3052 3263
3053Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3108 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3109 3320
3110 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3111 3322
3112 if (ref $msg) { 3323 if (ref $msg) {
3113 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3114 "ARRAY" eq ref $msg
3115 ? @$msg
3116 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3117 3325
3118 my @reply; 3326 my @reply;
3119 3327
3120 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3121 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3123 3331
3124 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3333 if $reply;
3126 3334
3127 } else { 3335 } else {
3128 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3129 } 3337 }
3130 3338
3131 cf::override; 3339 cf::override;
3132 }, 3340 },
3133); 3341);
… …
3214 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3218) { 3426) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3429 for @funs;
3223} 3430}
3224 3431
… …
3263 local @cf::_safe_eval_args = values %vars; 3470 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3471 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3472 }
3266 3473
3267 if ($@) { 3474 if ($@) {
3268 warn "$@"; 3475 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3271 } 3478 }
3272 3479
3273 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3274} 3481}
3275 3482
… …
3300=cut 3507=cut
3301 3508
3302############################################################################# 3509#############################################################################
3303# the server's init and main functions 3510# the server's init and main functions
3304 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3305sub load_facedata($) { 3514sub load_facedata($) {
3306 my ($path) = @_; 3515 my ($path) = @_;
3307 3516
3308 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3309 # for this (global event?) 3518 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3520
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3522
3314 warn "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3315 3524
3316 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3317 0 < aio_load $path, $facedata
3318 or die "$path: $!";
3319
3320 $facedata = Coro::Storable::thaw $facedata;
3321 3526
3322 $facedata->{version} == 2 3527 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3324 3529
3325 # patch in the exptable 3530 # patch in the exptable
… …
3332 cf::cede_to_tick; 3537 cf::cede_to_tick;
3333 3538
3334 { 3539 {
3335 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3336 3541
3337 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3338 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339 3545
3340 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3344 3552
3345 cf::cede_to_tick; 3553 cf::cede_to_tick;
3346 } 3554 }
3347 3555
3348 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3353 3561
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3562 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3563 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3565 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3566 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3567 }
3360 3568
3361 cf::cede_to_tick; 3569 cf::cede_to_tick;
3362 } 3570 }
3363 } 3571 }
… …
3375 3583
3376 { 3584 {
3377 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3378 3586
3379 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3380 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3591
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3385 } else { 3596 } else {
3386 $RESOURCE{$name} = $info; 3597# $RESOURCE{$name} = $info; # unused
3387 } 3598 }
3388 3599
3389 cf::cede_to_tick; 3600 cf::cede_to_tick;
3390 } 3601 }
3391 } 3602 }
3392 3603
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3605
3395 1 3606 1
3396} 3607}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3608
3418register_exticmd fx_want => sub { 3609register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3610 my ($ns, $want) = @_;
3420 3611
3421 while (my ($k, $v) = each %$want) { 3612 while (my ($k, $v) = each %$want) {
… …
3460sub reload_treasures { 3651sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3652 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3653 or die "unable to load treasurelists\n";
3463} 3654}
3464 3655
3656sub reload_sound {
3657 trace "loading sound config from $DATADIR/sound\n";
3658
3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3660
3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3662 my $sound = $soundconf->{compat}[$_]
3663 or next;
3664
3665 my $face = cf::face::find "sound/$sound->[1]";
3666 cf::sound::set $sound->[0] => $face;
3667 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3668 }
3669
3670 while (my ($k, $v) = each %{$soundconf->{event}}) {
3671 my $face = cf::face::find "sound/$v";
3672 cf::sound::set $k => $face;
3673 }
3674}
3675
3465sub reload_resources { 3676sub reload_resources {
3466 warn "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3467 3678
3679 reload_exp_table;
3680 reload_materials;
3468 reload_facedata; 3681 reload_facedata;
3682 reload_sound;
3469 reload_archetypes; 3683 reload_archetypes;
3470 reload_regions; 3684 reload_regions;
3471 reload_treasures; 3685 reload_treasures;
3472 3686
3473 warn "finished reloading resource files\n"; 3687 trace "finished reloading resource files\n";
3474} 3688}
3475 3689
3476sub reload_config { 3690sub reload_config {
3477 warn "reloading config file...\n"; 3691 trace "reloading config file...\n";
3478 3692
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3693 my $config = load_file "$CONFDIR/config";
3480 or return; 3694 utf8::decode $config;
3695 *CFG = decode_yaml $config;
3481 3696
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3698
3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3489 3701
3490 if (exists $CFG{mlockall}) { 3702 if (exists $CFG{mlockall}) {
… …
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3705 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3706 };
3495 warn $@ if $@; 3707 warn $@ if $@;
3496 } 3708 }
3497
3498 warn "finished reloading resource files\n";
3499} 3709}
3500 3710
3501sub pidfile() { 3711sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3712 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3713 or die "$PIDFILE: $!";
… …
3516 seek $fh, 0, 0; 3726 seek $fh, 0, 0;
3517 print $fh $$; 3727 print $fh $$;
3518} 3728}
3519 3729
3520sub main_loop { 3730sub main_loop {
3521 warn "EV::loop starting\n"; 3731 trace "EV::loop starting\n";
3522 if (1) { 3732 if (1) {
3523 EV::loop; 3733 EV::loop;
3524 } 3734 }
3525 warn "EV::loop returned\n"; 3735 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3736 goto &main_loop unless $REALLY_UNLOOP;
3527} 3737}
3528 3738
3529sub main { 3739sub main {
3530 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3531 3741
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536 3746
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543 3748
3544 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3547 (async { 3752 (async {
3548 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3549 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3550 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3551 }; 3756 };
3552 3757
3553 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3554 3759
3555 cf::sync_job { 3760 cf::sync_job {
3761 cf::incloader::init ();
3762
3763 cf::init_anim;
3764 cf::init_attackmess;
3765 cf::init_dynamic;
3766
3556 cf::load_settings; 3767 cf::load_settings;
3557 cf::load_materials;
3558 3768
3559 reload_resources; 3769 reload_resources;
3560 reload_config; 3770 reload_config;
3561 db_init; 3771 db_init;
3562 3772
… …
3574 3784
3575 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3786 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578 3788
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3580 }; 3790 };
3581 3791
3792 cf::object::thawer::errors_are_fatal 0;
3793 info "parse errors in files are no longer fatal from this point on.\n";
3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3582 main_loop; 3799 goto &main_loop;
3583} 3800}
3584 3801
3585############################################################################# 3802#############################################################################
3586# initialisation and cleanup 3803# initialisation and cleanup
3587 3804
… …
3626 or return; 3843 or return;
3627 3844
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3845 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3846 and return;
3630 3847
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3848 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3849
3633 1 3850 1
3634} 3851}
3635 3852
3636our $uuid_lock; 3853our $uuid_lock;
… …
3648 or return; 3865 or return;
3649 3866
3650 my $value = uuid_seq uuid_cur; 3867 my $value = uuid_seq uuid_cur;
3651 3868
3652 unless ($value) { 3869 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3870 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3871 return;
3655 } 3872 }
3656 3873
3657 my $value = uuid_str $value + $uuid_skip; 3874 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3875 $uuid_skip = 0;
… …
3668 or return; 3885 or return;
3669 3886
3670 aio_rename "$uuid~", $uuid 3887 aio_rename "$uuid~", $uuid
3671 and return; 3888 and return;
3672 3889
3673 warn "uuid file written ($value).\n"; 3890 trace "uuid file written ($value).\n";
3674 3891
3675 1 3892 1
3676 3893
3677} 3894}
3678 3895
… …
3684} 3901}
3685 3902
3686sub emergency_save() { 3903sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3904 my $freeze_guard = cf::freeze_mainloop;
3688 3905
3689 warn "emergency_perl_save: enter\n"; 3906 info "emergency_perl_save: enter\n";
3907
3908 # this is a trade-off: we want to be very quick here, so
3909 # save all maps without fsync, and later call a global sync
3910 # (which in turn might be very very slow)
3911 local $USE_FSYNC = 0;
3690 3912
3691 cf::sync_job { 3913 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3914 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 3915
3697 # use a peculiar iteration method to avoid tripping on perl 3916 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3917 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3918 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3919 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3920 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3921 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3922 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3923 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3924 $pl->save;
3706 } 3925 }
3707 warn "emergency_perl_save: end player save\n"; 3926 info "emergency_perl_save: end player save\n";
3708 3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3709 warn "emergency_perl_save: begin map save\n"; 3930 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3931 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3932 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3933 $map->valid or next;
3713 $map->save; 3934 $map->save;
3714 } 3935 }
3715 warn "emergency_perl_save: end map save\n"; 3936 info "emergency_perl_save: end map save\n";
3716 3937
3938 cf::write_runtime_sync; # external watchdog should not bark
3939
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3940 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3941 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3942 info "emergency_perl_save: end database checkpoint\n";
3720 3943
3721 warn "emergency_perl_save: begin write uuid\n"; 3944 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3945 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n"; 3946 info "emergency_perl_save: end write uuid\n";
3947
3948 cf::write_runtime_sync; # external watchdog should not bark
3949
3950 trace "emergency_perl_save: syncing database to disk";
3951 BDB::db_env_txn_checkpoint $DB_ENV;
3952
3953 info "emergency_perl_save: starting sync\n";
3954 IO::AIO::aio_sync sub {
3955 info "emergency_perl_save: finished sync\n";
3956 };
3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3960 trace "emergency_perl_save: flushing outstanding aio requests";
3961 while (IO::AIO::nreqs || BDB::nreqs) {
3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3963 }
3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3724 }; 3966 };
3725 3967
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 3968 info "emergency_perl_save: leave\n";
3732} 3969}
3733 3970
3734sub post_cleanup { 3971sub post_cleanup {
3735 my ($make_core) = @_; 3972 my ($make_core) = @_;
3736 3973
3974 IO::AIO::flush;
3975
3737 warn Carp::longmess "post_cleanup backtrace" 3976 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3977 if $make_core;
3739 3978
3740 my $fh = pidfile; 3979 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3980 unlink $PIDFILE if <$fh> == $$;
3742} 3981}
… …
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4001 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 4002 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 4003 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4004# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 4005 }
3767 warn "cleared package $pkg\n";#d#
3768} 4006}
3769 4007
3770sub do_reload_perl() { 4008sub do_reload_perl() {
3771 # can/must only be called in main 4009 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 4010 unless (in_main) {
3773 warn "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3774 return; 4012 return;
3775 } 4013 }
3776 4014
3777 return if $RELOAD++; 4015 return if $RELOAD++;
3778 4016
3779 my $t1 = AE::time; 4017 my $t1 = AE::time;
3780 4018
3781 while ($RELOAD) { 4019 while ($RELOAD) {
3782 warn "reloading..."; 4020 cf::get_slot 0.1, -1, "reload_perl";
4021 info "perl_reload: reloading...";
3783 4022
3784 warn "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3785 4024
3786 cf::sync_job { 4025 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 4026 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 4027
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 4030 %EXT_CORO = ();
3804 4031
3805 warn "removing commands"; 4032 trace "perl_reload: removing commands";
3806 %COMMAND = (); 4033 %COMMAND = ();
3807 4034
3808 warn "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 4036 %EXTCMD = ();
3810 %EXTICMD = (); 4037 %EXTICMD = ();
3811 4038
3812 warn "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 4041 trace "... unloading $pkg";
3815 4042
3816 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3817 eval { 4044 eval {
3818 $cb->($pkg); 4045 $cb->($pkg);
3819 1 4046 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 4047 } or error "$pkg unloaded, but with errors: $@";
3821 } 4048 }
3822 4049
3823 warn "... clearing $pkg"; 4050 trace "... clearing $pkg";
3824 clear_package $pkg; 4051 clear_package $pkg;
3825 } 4052 }
3826 4053
3827 warn "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 4057
3831 warn "... unloading $k"; 4058 trace "... unloading $k";
3832 delete $INC{$k}; 4059 delete $INC{$k};
3833 4060
3834 $k =~ s/\.pm$//; 4061 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 4062 $k =~ s/\//::/g;
3836 4063
… …
3839 } 4066 }
3840 4067
3841 clear_package $k; 4068 clear_package $k;
3842 } 4069 }
3843 4070
3844 warn "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 4072 clear_package "safe::$_"
3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3847 4074
3848 warn "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 4078
3852 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3853 # and global variables created in xs 4080 # and global variables created in xs
3854 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3855 4082
3856 warn "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3857 4084
3858 warn "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3859 require cf; 4086 require cf;
3860 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3861 4088
3862 warn "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4090 cf::reload_config;
3864 4091
3865 warn "loading extensions"; 4092 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4093 cf::load_extensions;
3867 4094
3868 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3875 } 4102 }
3876 4103
3877 warn "running post_init jobs"; 4104 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4105
3880 warn "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3881 4107
3882 1 4108 1
3883 } or do { 4109 } or do {
3884 warn $@; 4110 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4112 };
3887 4113
3888 warn "reloaded";
3889 --$RELOAD; 4114 --$RELOAD;
3890 } 4115 }
3891 4116
3892 $t1 = AE::time - $t1; 4117 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3894}; 4119};
3895 4120
3896our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3897 4122
3898sub reload_perl() { 4123sub reload_perl() {
… …
3919 reload_perl; 4144 reload_perl;
3920 }; 4145 };
3921 } 4146 }
3922}; 4147};
3923 4148
3924unshift @INC, $LIBDIR; 4149#############################################################################
3925 4150
3926my $bug_warning = 0; 4151my $bug_warning = 0;
3927 4152
3928our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN;
3930
3931sub wait_for_tick { 4153sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3933 4155
3934 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
3935 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait;
3937} 4157}
3938 4158
3939sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3941 4161
3942 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4164 $signal->wait;
3945} 4165}
… …
3949 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3950 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
3951 return; 4171 return;
3952 } 4172 }
3953 4173
3954 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
3955 4175
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3957 4177
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3960 Coro::async_pool { 4180 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4181 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4182 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4183 or error "ERROR: unable to write runtime file: $!";
3964 }; 4184 };
3965 } 4185 }
3966 4186
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4188 $sig->send;
3969 } 4189 }
3970 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
3971 $sig->send;
3972 }
3973 4191
3974 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3976 4194
3977 if (0) { 4195 if (0) {
3978 if ($NEXT_TICK) { 4196 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4197 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4198 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4199 debug "jitter $JITTER\n";#d#
3982 } 4200 }
3983 } 4201 }
3984} 4202}
3985 4203
3986{ 4204{
3987 # configure BDB 4205 # configure BDB
3988 4206
3989 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
3990 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
3991 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
3992 4210
3993 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
3994 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4031 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4034} 4252}
4035 4253
4036my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4037 4256
4038sub _log_backtrace { 4257sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4040 4259
4041 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4042 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4268 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4047 async { 4270 async {
4048 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4049 4272
… …
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4293 --$_log_backtrace;
4071 }; 4294 };
4072 } else { 4295 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4298 }
4076} 4299}
4077 4300
4078# load additional modules 4301# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines