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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
112 124
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 127our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 133our $DB_ENV;
122 134
123our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 136
125our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 139
127our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
129our $NOW; 143our $NOW;
130 144
131our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
142 156
143our @POST_INIT; 157our @POST_INIT;
144 158
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
147 164
148binmode STDOUT; 165binmode STDOUT;
149binmode STDERR; 166binmode STDERR;
150 167
151# read virtual server time, if available 168# read virtual server time, if available
… …
162 179
163our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
164 181
165sub cf::map::normalise; 182sub cf::map::normalise;
166 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
167############################################################################# 188#############################################################################
168 189
169%REFLECT = (); 190%REFLECT = ();
170for (@REFLECT) { 191for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
181 202
182=over 4 203=over 4
183 204
184=item $cf::UPTIME 205=item $cf::UPTIME
185 206
186The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
187 223
188=item $cf::RUNTIME 224=item $cf::RUNTIME
189 225
190The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 227every server tick.
192 228
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 232
197Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
200database environment. 236database environment.
201 237
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 238=item $cf::LOADAVG
211 239
212The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
213(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
223from wherever your confdir points to. 251from wherever your confdir points to.
224 252
225=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
226 254
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
230 275
231=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
232 277
233This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 287
243=back 288=back
244 289
245=cut 290=cut
246 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
247$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 299 my $msg = join "", @_;
249 300
250 $msg .= "\n" 301 $msg .= "\n"
251 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
252 303
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 305
255 LOG llevError, $msg; 306 LOG llevWarn, $msg;
256}; 307};
257 308
258$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
260 311
261 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
262 313
263 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 316 return;#d#
266 }#d# 317 }#d#
267 318
268 # kill coroutine otherwise 319 # kill coroutine otherwise
269 Coro::terminate 320 Coro::terminate
… …
289)) { 340)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 342}
292 343
293$EV::DIED = sub { 344$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
295}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
296 352
297############################################################################# 353#############################################################################
298 354
299=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
300 356
… …
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 378 $d
323 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
324} 380}
325 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
326=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
327 435
328Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
329 437
330=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 445
338sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
340 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
341=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
342 481
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
345 484
346The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 486is a reload or not.
348 487
349=cut 488=cut
350 489
351sub post_init(&) { 490sub post_init(&) {
352 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
353} 509}
354 510
355=item cf::lock_wait $string 511=item cf::lock_wait $string
356 512
357Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
396} 552}
397 553
398=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
399 555
400Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 557get spread over time.
402 558
403=cut 559=cut
404 560
405sub periodic($$) { 561sub periodic($$) {
406 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
411} 567}
412 568
413=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
414 570
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
418 578
419The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
421 581
422Useful for short background jobs. 582Useful for short background jobs.
… …
451 } 611 }
452 } 612 }
453 613
454 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 617 } else {
459 $busy = 0; 618 $busy = 0;
460 Coro::schedule; 619 Coro::schedule;
461 } 620 }
462 } 621 }
… …
502=cut 661=cut
503 662
504sub sync_job(&) { 663sub sync_job(&) {
505 my ($job) = @_; 664 my ($job) = @_;
506 665
507 if ($Coro::current == $Coro::main) { 666 if (in_main) {
508 my $time = EV::time; 667 my $time = AE::time;
509 668
510 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
512 671
513 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
514 673
515 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
516 675
517 my $busy = 1; 676 my $busy = 1;
518 my @res; 677 my @res;
519 678
520 (async { 679 (async {
521 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 681 @res = eval { $job->() };
523 warn $@ if $@; 682 error $@ if $@;
524 undef $busy; 683 undef $busy;
525 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
526 685
527 while ($busy) { 686 while ($busy) {
528 if (Coro::nready) { 687 if (Coro::nready) {
… …
530 } else { 689 } else {
531 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
532 } 691 }
533 } 692 }
534 693
535 my $time = EV::time - $time; 694 my $time = AE::time - $time;
536 695
537 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
538 697
539 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
540 } else { 699 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
563 722
564 $coro 723 $coro
565} 724}
566 725
567=item fork_call { }, $args 726=item fork_call { }, @args
568 727
569Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 731never block itself or use any form of event handling.
573 732
574=cut 733=cut
575 734
735sub post_fork {
736 reset_signals;
737}
738
576sub fork_call(&@) { 739sub fork_call(&@) {
577 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
578 741
579 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
582 745
583 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
584 reset_signals; 747 cf::post_fork;
585 &$cb 748 &$cb
586 }, @args; 749 } @args;
587 750
588 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
589} 763}
590 764
591=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
592 766
593=cut 767=cut
… …
630within each server. 804within each server.
631 805
632=cut 806=cut
633 807
634sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
635 my ($name) = @_; 812 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
637 814
638 eval { 815 eval {
639 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
649} 826}
650 827
651our $DB; 828our $DB;
652 829
653sub db_init { 830sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
656 };
657} 832}
658 833
659sub db_get($$) { 834sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
661 836
662 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
663 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
664 841
665 $! ? () 842 $! ? ()
666 : $data 843 : $data
667 }
668} 844}
669 845
670sub db_put($$$) { 846sub db_put($$$) {
671 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 876
701 my @data; 877 my @data;
702 my $md5; 878 my $md5;
703 879
704 for (0 .. $#$src) { 880 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 882 }
708 883
709 # if processing is expensive, check 884 # if processing is expensive, check
710 # checksum first 885 # checksum first
711 if (1) { 886 if (1) {
… …
728 903
729 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 905 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
732 907
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 909
735 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
738 913
… …
748 923
749=cut 924=cut
750 925
751sub datalog($@) { 926sub datalog($@) {
752 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 929}
755 930
756=back 931=back
757 932
758=cut 933=cut
… …
953 1128
954 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1131
957 } elsif (ref $type) { 1132 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
959 1134
960 } else { 1135 } else {
961 shift @arg; 1136 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
963 } 1138 }
964 } 1139 }
965} 1140}
966 1141
967sub _object_attach { 1142sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
978 } 1153 }
979 1154
980 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
981 } else { 1156 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1158 }
984 1159
985 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
986} 1161}
987 1162
… …
1046 1221
1047 for (@$callbacks) { 1222 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1049 1224
1050 if ($@) { 1225 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1227 override;
1054 } 1228 }
1055 1229
1056 return 1 if $override; 1230 return 1 if $override;
1057 } 1231 }
… …
1136 for (@$attach) { 1310 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1139 } 1313 }
1140 } else { 1314 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1316 }
1143 } 1317 }
1144} 1318}
1145 1319
1146cf::attachable->attach ( 1320cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1174 1348
1175 sync_job { 1349 sync_job {
1176 if (length $$rdata) { 1350 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1180 1355
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1207 1382
1208 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1385 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1212 } 1387 }
1213 } else { 1388 } else {
1214 aio_unlink $filename; 1389 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1216 } 1391 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1416 $av = $st->{objs};
1242 } 1417 }
1243 1418
1244 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1247 1423
1248 ($data, $av) 1424 ($data, $av)
1249} 1425}
1250 1426
1251=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1255=cut 1431=cut
1256 1432
1257############################################################################# 1433#############################################################################
1258# command handling &c 1434# command handling &c
1259 1435
1260=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1261 1437
1262Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1263$name. 1439$name.
1264 1440
1265=cut 1441=cut
… …
1271 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1272 1448
1273 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1274} 1450}
1275 1451
1276=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1277 1453
1278Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1279extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1280received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1281the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1282has logged in successfully. 1458has logged in successfully.
1283 1459
1284If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1285called. 1461called.
1286 1462
1287=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1288 1464
1289Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1290exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1291are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1292is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
… …
1310} 1486}
1311 1487
1312use File::Glob (); 1488use File::Glob ();
1313 1489
1314cf::player->attach ( 1490cf::player->attach (
1315 on_command => sub { 1491 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1317 1493
1318 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1319 or return; 1495 or return;
1320 1496
… …
1328 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1329 1505
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1507
1332 if (ref $msg) { 1508 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1510
1338 my @reply; 1511 my @reply;
1339 1512
1340 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1342 } 1515 }
1343 1516
1344 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1345 if $reply; 1518 if $reply;
1346 1519
1347 } else { 1520 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1522 }
1350 1523
1351 cf::override; 1524 cf::override;
1352 }, 1525 },
1353); 1526);
… …
1363 }; 1536 };
1364 1537
1365 $grp 1538 $grp
1366} 1539}
1367 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1368sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1369 cf::sync_job { 1557 cf::sync_job {
1370 my %todo; 1558 my %todo;
1371 1559
1372 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1561 next unless -r $path;
… …
1391 1579
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1582
1395 $ext{source} = 1583 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1398 . $source 1586 . $source
1399 . "\n};\n1"; 1587 . "\n};\n1";
1400 1588
1401 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1602 next ext
1415 unless exists $done{$_}; 1603 unless exists $done{$_};
1416 } 1604 }
1417 1605
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 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
1420 my $active = eval $v->{source}; 1617 my $active = eval $source;
1421 1618
1422 if (length $@) { 1619 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1424 1621
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 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};
1427 } else { 1627 } else {
1428 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1430 $progress = 1; 1630 $progress = 1;
1431 1631
1432 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1633 unless $active;
1434 } 1634 }
1435 } 1635 }
1436 1636
1437 unless ($progress) { 1637 unless ($progress) {
… …
1439 1639
1440 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1443 } 1643 }
1644
1645 last;
1444 } 1646 }
1445 } 1647 }
1446 }; 1648 };
1447} 1649}
1448 1650
… …
1533 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1534 } 1736 }
1535 } 1737 }
1536} 1738}
1537 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1538sub save($) { 1753sub save($) {
1539 my ($pl) = @_; 1754 my ($pl) = @_;
1540 1755
1541 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1542 1757
… …
1547 1762
1548 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1550 1765
1551 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1770
1553 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1772 cf::cede_to_tick;
1555} 1773}
1556 1774
… …
1590 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1591 1809
1592 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1593 $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
1594 1812
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1814 $pl->deactivate;
1815
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1600 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1601 1821
1602 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1658 \@logins 1878 \@logins
1659} 1879}
1660 1880
1661=item $player->maps 1881=item $player->maps
1662 1882
1883=item cf::player::maps $login
1884
1663Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1664player. May block. 1886player. May block.
1665 1887
1666=cut 1888=cut
1667 1889
… …
1688 1910
1689=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690 1912
1691Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1692 1914
1693=item $player->ext_reply ($msgid, @msg)
1694
1695Sends an ext reply to the player.
1696
1697=cut
1698
1699sub ext_reply($$@) {
1700 my ($self, $id, @msg) = @_;
1701
1702 $self->ns->ext_reply ($id, @msg)
1703}
1704
1705=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1706 1916
1707Sends an ext event to the client. 1917Sends an ext event to the client.
1708 1918
1709=cut 1919=cut
… …
1728 1938
1729=cut 1939=cut
1730 1940
1731sub find_by_path($) { 1941sub find_by_path($) {
1732 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1733 1945
1734 my ($match, $specificity); 1946 my ($match, $specificity);
1735 1947
1736 for my $region (list) { 1948 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
… …
1766sub generate_random_map { 1978sub generate_random_map {
1767 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1768 1980
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1982
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1984}
1786 1985
1787=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1788 1987
1789Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
… …
1794 1993
1795sub register { 1994sub register {
1796 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1996 my $pkg = caller;
1798 1997
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1999
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 2001}
1804 2002
1805# also paths starting with '/' 2003# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 2005
1808sub thawer_merge { 2006sub thawer_merge {
1809 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1810 2008
1811 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
… …
1816} 2014}
1817 2015
1818sub normalise { 2016sub normalise {
1819 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1820 2018
1821 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1822 2020
1823 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1824 2022
1825 # map plan: 2023 # map plan:
1826 # 2024 #
… …
1841 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 2040 $path = "$base/$path";
1843 } 2041 }
1844 2042
1845 for ($path) { 2043 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1849 } 2046 }
1850 2047
1851 $path 2048 $path
… …
1865 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1866 return $self; 2063 return $self;
1867 } 2064 }
1868 } 2065 }
1869 2066
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2068 ()
1872} 2069}
1873 2070
2071# may re-bless or do other evil things
1874sub init { 2072sub init {
1875 my ($self) = @_; 2073 my ($self) = @_;
1876 2074
1877 $self 2075 $self
1878} 2076}
… …
1943 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1944 2142
1945 1 2143 1
1946} 2144}
1947 2145
2146# used to laod the header of an original map
1948sub load_header_orig { 2147sub load_header_orig {
1949 my ($self) = @_; 2148 my ($self) = @_;
1950 2149
1951 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1952} 2151}
1953 2152
2153# used to laod the header of an instantiated map
1954sub load_header_temp { 2154sub load_header_temp {
1955 my ($self) = @_; 2155 my ($self) = @_;
1956 2156
1957 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1958} 2158}
1959 2159
2160# called after loading the header from an instantiated map
1960sub prepare_temp { 2161sub prepare_temp {
1961 my ($self) = @_; 2162 my ($self) = @_;
1962 2163
1963 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1965 # safety 2166 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2169}
1969 2170
2171# called after loading the header from an original map
1970sub prepare_orig { 2172sub prepare_orig {
1971 my ($self) = @_; 2173 my ($self) = @_;
1972 2174
1973 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
… …
1998 2200
1999sub find; 2201sub find;
2000sub find { 2202sub find {
2001 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2002 2204
2205 cf::cede_to_tick;
2206
2003 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2004 2208
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2211
2008 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
… …
2039 2243
2040 { 2244 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2042 2246
2043 return unless $self->valid; 2247 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2249
2048 $self->alloc; 2250 $self->alloc;
2049 2251
2050 $self->pre_load; 2252 $self->pre_load;
2051 cf::cede_to_tick; 2253 cf::cede_to_tick;
2052 2254
2255 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2257 $f->skip_block;
2055 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2056 or return; 2259 or return;
2057 2260
2058 $self->post_load_original 2261 $self->post_load_original
2059 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2060 2263
2061 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2265 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2268 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2068 } 2272 }
2069 } 2273 }
2070 }
2071 2274
2072 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2073 2282
2074 cf::cede_to_tick; 2283 cf::cede_to_tick;
2075 # now do the right thing for maps 2284 # now do the right thing for maps
2076 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
… …
2081 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2291 $self->decay_objects;
2083 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2084 $self->update_buttons; 2293 $self->update_buttons;
2085 cf::cede_to_tick; 2294 cf::cede_to_tick;
2086 $self->activate; 2295 #$self->activate; # no longer activate maps automatically
2087 } 2296 }
2088 2297
2089 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2300 }
2094 2301
2095 $self->post_load; 2302 $self->post_load;
2303
2304 1
2096} 2305}
2097 2306
2098# customize the map for a given player, i.e. 2307# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2308# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2309# maps to change the path to ~playername/mappath
… …
2108# if $self->per_party; 2317# if $self->per_party;
2109 2318
2110 $self 2319 $self
2111} 2320}
2112 2321
2113# find and load all maps in the 3x3 area around a map
2114sub load_neighbours {
2115 my ($map) = @_;
2116
2117 my @neigh; # diagonal neighbours
2118
2119 for (0 .. 3) {
2120 my $neigh = $map->tile_path ($_)
2121 or next;
2122 $neigh = find $neigh, $map
2123 or next;
2124 $neigh->load;
2125
2126 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 }
2130
2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
2133 my $neigh = find $path, $origin
2134 or next;
2135 $neigh->load;
2136 }
2137}
2138
2139sub find_sync { 2322sub find_sync {
2140 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2141 2324
2142 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2143} 2330}
2144 2331
2145sub do_load_sync { 2332sub do_load_sync {
2146 my ($map) = @_; 2333 my ($map) = @_;
2147 2334
2335 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2150 2338
2151 cf::sync_job { $map->load }; 2339 $map->load;
2152} 2340}
2153 2341
2154our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2156 2344
2157sub find_async { 2345sub find_async {
2158 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2159 2347
2160 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2161 2349
2162 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2164 } 2352 }
2165 2353
2166 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2167 2355
2168 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
… …
2182 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2183 2371
2184 () 2372 ()
2185} 2373}
2186 2374
2375# common code, used by both ->save and ->swapout
2187sub save { 2376sub _save {
2188 my ($self) = @_; 2377 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2378
2192 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2193 2380
2194 return unless $self->dirty; 2381 return unless $self->dirty;
2195 2382
… …
2215 } else { 2402 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2403 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2404 }
2218} 2405}
2219 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2220sub swap_out { 2415sub swap_out {
2221 my ($self) = @_; 2416 my ($self) = @_;
2222 2417
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2228 return if $self->players; 2422 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2423
2424 # first deactivate the map and "unlink" it from the core
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
2427 $self->state (cf::MAP_SWAPPED);
2428
2429 # then atomically save
2430 $self->_save;
2431
2432 # then free the map
2433 $self->clear;
2434}
2435
2436sub reset_at {
2437 my ($self) = @_;
2438
2439 # TODO: safety, remove and allow resettable per-player maps
2230 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2231 2441
2442 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2443 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2444
2445 $time + $to
2446}
2447
2448sub should_reset {
2449 my ($self) = @_;
2450
2451 $self->reset_at <= $cf::RUNTIME
2452}
2453
2454sub reset {
2455 my ($self) = @_;
2456
2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2458
2459 return if $self->players;
2460
2461 cf::trace "resetting map ", $self->path, "\n";
2462
2232 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2464
2465 # need to save uniques path
2466 unless ($self->{deny_save}) {
2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2468
2469 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2470 if $uniq;
2471 }
2472
2473 delete $cf::MAP{$self->path};
2233 2474
2234 $self->deactivate; 2475 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2477 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2478
2282 $self->unlink_save; 2479 $self->unlink_save;
2283 $self->destroy; 2480 $self->destroy;
2284} 2481}
2285 2482
… …
2293 2490
2294 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2295 2492
2296 $self->unlink_save; 2493 $self->unlink_save;
2297 2494
2298 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2500
… …
2533 2730
2534Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2535 2732
2536The player should be reasonably safe there for short amounts of time (e.g. 2733The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2735though, as the player cannot control the character while it is on the link
2539map. 2736map.
2540 2737
2541Will never block. 2738Will never block.
2542 2739
2543=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2565 my ($self) = @_; 2762 my ($self) = @_;
2566 2763
2567 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2568 2765
2766 ++$self->{_link_recursion};
2767
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2769
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2573 2772
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2774}
2576 2775
2577sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2579 2778
… …
2599 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <= 0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2602 2801
2603 $map->load; 2802 $map->load;
2604 $map->load_neighbours;
2605 2803
2606 return unless $self->contr->active; 2804 return unless $self->contr->active;
2607 2805
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2610 2808 # entering was successful
2809 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2810 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2811 $self->activate_recursive;
2613} 2812 }
2614 2813
2814}
2815
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2817
2617Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
… …
2627 2828
2628our $GOTOGEN; 2829our $GOTOGEN;
2629 2830
2630sub cf::object::player::goto { 2831sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2632 2839
2633 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2842
2636 $self->enter_link; 2843 $self->enter_link;
… …
2656 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2657 } 2864 }
2658 } 2865 }
2659 2866
2660 my $map = eval { 2867 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2869
2663 if ($map) { 2870 if ($map) {
2664 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2873 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2875 }
2669 2876
2670 $map 2877 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2681 } 2888 }
2682 2889
2683 $done->() if $done; 2890 $done->($self) if $done;
2684 })->prio (1); 2891 })->prio (1);
2685} 2892}
2686 2893
2687=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2688 2895
… …
2756 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2757 2964
2758 unless (eval { 2965 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2760 2967
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2772 2994
2773 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2774 2996
2775 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2785 3007
2786 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 3009 $self->leave_link;
2788 } 3010 }
2789 })->prio (1); 3011 })->prio (1);
2790} 3012}
2791 3013
… …
3001=cut 3223=cut
3002 3224
3003sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
3004 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
3005 3227
3006 if ($self->extcmd == 2) {
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008 } elsif ($self->extcmd == 1) { # TODO: remove
3009 push @msg, msgtype => "event_$type";
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012}
3013
3014=item $client->ext_reply ($msgid, @msg)
3015
3016Sends an ext reply to the client.
3017
3018=cut
3019
3020sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_;
3022
3023 if ($self->extcmd == 2) {
3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
3030} 3229}
3031 3230
3032=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
3033 3232
3034Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
… …
3089 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3090 3289
3091 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092 3291
3093 if (ref $msg) { 3292 if (ref $msg) {
3094 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098 3294
3099 my @reply; 3295 my @reply;
3100 3296
3101 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3102 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3103 } 3299 }
3104 3300
3105 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3106 if $reply; 3302 if $reply;
3107 3303
3108 } else { 3304 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3306 }
3111 3307
3112 cf::override; 3308 cf::override;
3113 }, 3309 },
3114); 3310);
… …
3134 3330
3135 $coro 3331 $coro
3136} 3332}
3137 3333
3138cf::client->attach ( 3334cf::client->attach (
3139 on_destroy => sub { 3335 on_client_destroy => sub {
3140 my ($ns) = @_; 3336 my ($ns) = @_;
3141 3337
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3339 },
3144); 3340);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3393 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3199) { 3395) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3398 for @funs;
3204} 3399}
3205 3400
… …
3244 local @cf::_safe_eval_args = values %vars; 3439 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3440 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3441 }
3247 3442
3248 if ($@) { 3443 if ($@) {
3249 warn "$@"; 3444 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3252 } 3447 }
3253 3448
3254 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3255} 3450}
3256 3451
… …
3281=cut 3476=cut
3282 3477
3283############################################################################# 3478#############################################################################
3284# the server's init and main functions 3479# the server's init and main functions
3285 3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3504
3286sub load_facedata($) { 3505sub load_facedata($) {
3287 my ($path) = @_; 3506 my ($path) = @_;
3288 3507
3289 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3290 # for this (global event?) 3509 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3511
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3513
3295 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3296 3515
3297 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3517
3303 $facedata->{version} == 2 3518 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3305 3520
3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3308 $facedata->{resource}{"res/exp_table"} = {
3309 type => FT_RSRC,
3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3312 };
3313 cf::cede_to_tick; 3521 cf::cede_to_tick;
3314 3522
3315 { 3523 {
3316 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3317 3525
3318 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3319 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320 3529
3321 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3325 3536
3326 cf::cede_to_tick; 3537 cf::cede_to_tick;
3327 } 3538 }
3328 3539
3329 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
… …
3334 3545
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3549 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3551 }
3341 3552
3342 cf::cede_to_tick; 3553 cf::cede_to_tick;
3343 } 3554 }
3344 } 3555 }
… …
3356 3567
3357 { 3568 {
3358 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3359 3570
3360 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3575
3576 cf::face::set_type $idx, $type;
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3366 } else { 3580 } else {
3367 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3368 } 3582 }
3369 3583
3370 cf::cede_to_tick; 3584 cf::cede_to_tick;
3371 } 3585 }
3372 } 3586 }
3373 3587
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3589
3376 1 3590 1
3377} 3591}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3592
3399register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3401 3595
3402 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
… …
3410 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3412 cf::arch::commit_load; 3606 cf::arch::commit_load;
3413 3607
3414 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3415} 3622}
3416 3623
3417sub reload_regions { 3624sub reload_regions {
3418 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3419 # for this (global event?) 3626 # for this (global event?)
… …
3434} 3641}
3435 3642
3436sub reload_archetypes { 3643sub reload_archetypes {
3437 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3438 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3439} 3655}
3440 3656
3441sub reload_treasures { 3657sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3444} 3660}
3445 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3446sub reload_resources { 3744sub reload_resources {
3447 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3448 3746
3747 reload_materials;
3449 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3450 reload_archetypes; 3751 reload_archetypes;
3451 reload_regions; 3752 reload_regions;
3452 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3453 3755
3454 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3455} 3757}
3456 3758
3457sub reload_config { 3759sub reload_config {
3458 warn "reloading config file...\n"; 3760 trace "reloading config file...\n";
3459 3761
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3762 my $config = load_file "$CONFDIR/config";
3461 or return; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3462 3765
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3767
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3770
3471 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3773 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3774 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3775 };
3476 warn $@ if $@; 3776 warn $@ if $@;
3477 } 3777 }
3478
3479 warn "finished reloading resource files\n";
3480} 3778}
3481 3779
3482sub pidfile() { 3780sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3782 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3498 print $fh $$; 3796 print $fh $$;
3499} 3797}
3500 3798
3501sub main_loop { 3799sub main_loop {
3502 warn "EV::loop starting\n"; 3800 trace "EV::loop starting\n";
3503 if (1) { 3801 if (1) {
3504 EV::loop; 3802 EV::loop;
3505 } 3803 }
3506 warn "EV::loop returned\n"; 3804 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3805 goto &main_loop unless $REALLY_UNLOOP;
3508} 3806}
3509 3807
3510sub main { 3808sub main {
3511 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3512 3810
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517 3815
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3817
3525 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3528 (async { 3821 (async {
3529 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3531 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3532 }; 3825 };
3533 3826
3534 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3535 3828
3536 cf::sync_job { 3829 cf::sync_job {
3830 cf::incloader::init ();
3831
3832 db_init;
3833
3834 cf::init_anim;
3835 cf::init_attackmess;
3836 cf::init_dynamic;
3837
3537 cf::load_settings; 3838 cf::load_settings;
3538 cf::load_materials;
3539 3839
3540 reload_resources; 3840 reload_resources;
3541 reload_config; 3841 reload_config;
3542 db_init;
3543 3842
3544 cf::init_uuid; 3843 cf::init_uuid;
3545 cf::init_signals; 3844 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3845 cf::init_skills;
3548 3846
3549 cf::init_beforeplay; 3847 cf::init_beforeplay;
3550 3848
3551 atomic; 3849 atomic;
… …
3556 3854
3557 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3856 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3858
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3859 cf::_post_init 0;
3562 }; 3860 };
3563 3861
3862 cf::object::thawer::errors_are_fatal 0;
3863 info "parse errors in files are no longer fatal from this point on.\n";
3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3564 main_loop; 3869 goto &main_loop;
3565} 3870}
3566 3871
3567############################################################################# 3872#############################################################################
3568# initialisation and cleanup 3873# initialisation and cleanup
3569 3874
3570# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3571BEGIN { 3876BEGIN {
3572 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3576 }; 3881 };
3577 } 3882 }
3578} 3883}
3579 3884
3580sub write_runtime_sync { 3885sub write_runtime_sync {
3581 my $t0 = EV::time; 3886 my $t0 = AE::time;
3582 3887
3583 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3585 3890
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3913 or return;
3609 3914
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3916 and return;
3612 3917
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3919
3615 1 3920 1
3616} 3921}
3617 3922
3618our $uuid_lock; 3923our $uuid_lock;
… …
3630 or return; 3935 or return;
3631 3936
3632 my $value = uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3633 3938
3634 unless ($value) { 3939 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3940 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3941 return;
3637 } 3942 }
3638 3943
3639 my $value = uuid_str $value + $uuid_skip; 3944 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3945 $uuid_skip = 0;
… …
3650 or return; 3955 or return;
3651 3956
3652 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3653 and return; 3958 and return;
3654 3959
3655 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3656 3961
3657 1 3962 1
3658 3963
3659} 3964}
3660 3965
… …
3666} 3971}
3667 3972
3668sub emergency_save() { 3973sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3670 3975
3671 warn "emergency_perl_save: enter\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3672 3982
3673 cf::sync_job { 3983 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3984 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3985
3679 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3992 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3994 $pl->save;
3688 } 3995 }
3689 warn "emergency_perl_save: end player save\n"; 3996 info "emergency_perl_save: end player save\n";
3690 3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
3691 warn "emergency_perl_save: begin map save\n"; 4000 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 4003 $map->valid or next;
3695 $map->save; 4004 $map->save;
3696 } 4005 }
3697 warn "emergency_perl_save: end map save\n"; 4006 info "emergency_perl_save: end map save\n";
3698 4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
3699 warn "emergency_perl_save: begin database checkpoint\n"; 4010 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3702 4013
3703 warn "emergency_perl_save: begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 4015 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 4036 };
3707 4037
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 4038 info "emergency_perl_save: leave\n";
3714} 4039}
3715 4040
3716sub post_cleanup { 4041sub post_cleanup {
3717 my ($make_core) = @_; 4042 my ($make_core) = @_;
3718 4043
4044 IO::AIO::flush;
4045
3719 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 4047 if $make_core;
3721 4048
3722 my $fh = pidfile; 4049 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3724} 4051}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 4072 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 4073 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 4075 }
3749 warn "cleared package $pkg\n";#d#
3750} 4076}
3751 4077
3752sub do_reload_perl() { 4078sub do_reload_perl() {
3753 # can/must only be called in main 4079 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3755 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3756 return; 4082 return;
3757 } 4083 }
3758 4084
3759 return if $RELOAD++; 4085 return if $RELOAD++;
3760 4086
3761 my $t1 = EV::time; 4087 my $t1 = AE::time;
3762 4088
3763 while ($RELOAD) { 4089 while ($RELOAD) {
3764 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3765 4092
3766 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3767 4094
3768 cf::sync_job { 4095 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 4096 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 4097
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 4100 %EXT_CORO = ();
3786 4101
3787 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3788 %COMMAND = (); 4103 %COMMAND = ();
3789 4104
3790 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 4106 %EXTCMD = ();
3792 %EXTICMD = (); 4107 %EXTICMD = ();
3793 4108
3794 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3797 4112
3798 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3799 eval { 4114 eval {
3800 $cb->($pkg); 4115 $cb->($pkg);
3801 1 4116 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3803 } 4118 }
3804 4119
3805 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3806 clear_package $pkg; 4121 clear_package $pkg;
3807 } 4122 }
3808 4123
3809 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 4127
3813 warn "... unloading $k"; 4128 trace "... unloading $k";
3814 delete $INC{$k}; 4129 delete $INC{$k};
3815 4130
3816 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3818 4133
… …
3821 } 4136 }
3822 4137
3823 clear_package $k; 4138 clear_package $k;
3824 } 4139 }
3825 4140
3826 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 4142 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 4144
3830 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 4148
3834 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3835 # and global variables created in xs 4150 # and global variables created in xs
3836 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3837 4152
3838 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3839 4154
3840 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3841 require cf; 4156 require cf;
3842 cf::_connect_to_perl_1; 4157 cf::_connect_to_perl_1;
3843 4158
3844 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 4160 cf::reload_config;
3846 4161
3847 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 4163 cf::load_extensions;
3849 4164
3850 if ($REATTACH_ON_RELOAD) { 4165 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
3857 } 4172 }
3858 4173
3859 warn "running post_init jobs"; 4174 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 4175
3862 warn "leaving sync_job"; 4176 trace "perl_reload: leaving sync_job";
3863 4177
3864 1 4178 1
3865 } or do { 4179 } or do {
3866 warn $@; 4180 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3868 }; 4182 };
3869 4183
3870 warn "reloaded";
3871 --$RELOAD; 4184 --$RELOAD;
3872 } 4185 }
3873 4186
3874 $t1 = EV::time - $t1; 4187 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4188 info "perl_reload: completed in ${t1}s\n";
3876}; 4189};
3877 4190
3878our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3879 4192
3880sub reload_perl() { 4193sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3883 4196
3884 $RELOAD_WATCHER ||= cf::async { 4197 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4198 Coro::AIO::aio_wait cache_extensions;
3886 4199
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4201 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
3890 }; 4203 };
3891 }; 4204 };
3892} 4205}
… …
3901 reload_perl; 4214 reload_perl;
3902 }; 4215 };
3903 } 4216 }
3904}; 4217};
3905 4218
3906unshift @INC, $LIBDIR; 4219#############################################################################
3907 4220
3908my $bug_warning = 0; 4221my $bug_warning = 0;
3909 4222
3910our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN;
3912
3913sub wait_for_tick { 4223sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3915 4225
3916 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3917 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait;
3919} 4227}
3920 4228
3921sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3923 4231
3924 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4234 $signal->wait;
3927} 4235}
… …
3931 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3932 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3933 return; 4241 return;
3934 } 4242 }
3935 4243
3936 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
3937 4245
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4247
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4250 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4252 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3946 }; 4254 };
3947 } 4255 }
3948 4256
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4258 $sig->send;
3951 } 4259 }
3952 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3953 $sig->send;
3954 }
3955 4261
3956 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3958 4264
3959 if (0) { 4265 if (0) {
3960 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3964 } 4270 }
3965 } 4271 }
3966} 4272}
3967 4273
3968{ 4274{
3969 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3970 4277
3971 BDB::min_parallel 16; 4278 BDB::min_parallel 16;
3972 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3973 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3974 4281
3975 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3976 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3977 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4003 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4004 }; 4311 };
4005 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4006 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4007 }; 4314 };
4315
4316 info "database initialised";
4008} 4317}
4009 4318
4010{ 4319{
4011 # configure IO::AIO 4320 # configure IO::AIO
4012 4321
4322 info "initialising aio";
4013 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
4016} 4327}
4017 4328
4018my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
4019 4331
4020sub _log_backtrace { 4332sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
4022 4334
4023 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
4024 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4343 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
4029 async { 4345 async {
4030 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
4031 4347
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4368 --$_log_backtrace;
4053 }; 4369 };
4054 } else { 4370 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4373 }
4058} 4374}
4059 4375
4060# load additional modules 4376# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4377require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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