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.517 by root, Thu Apr 15 06:07:51 2010 UTC vs.
Revision 1.605 by root, Sat Nov 17 11:03:28 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 4000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
115 125
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 128our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
121our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 134our $DB_ENV;
125 135
126our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 137
128our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 140
130our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
132our $NOW; 144our $NOW;
133 145
134our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
145 157
146our @POST_INIT; 158our @POST_INIT;
147 159
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
150 165
151binmode STDOUT; 166binmode STDOUT;
152binmode STDERR; 167binmode STDERR;
153 168
154# read virtual server time, if available 169# read virtual server time, if available
165 180
166our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
167 182
168sub cf::map::normalise; 183sub cf::map::normalise;
169 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
170############################################################################# 189#############################################################################
171 190
172%REFLECT = (); 191%REFLECT = ();
173for (@REFLECT) { 192for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
184 203
185=over 4 204=over 4
186 205
187=item $cf::UPTIME 206=item $cf::UPTIME
188 207
189The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
190 224
191=item $cf::RUNTIME 225=item $cf::RUNTIME
192 226
193The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
194every server tick. 228every server tick.
195 229
196=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199 233
200Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
203database environment. 237database environment.
204 238
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 239=item $cf::LOADAVG
214 240
215The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
216(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
217objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
225Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
226from wherever your confdir points to. 252from wherever your confdir points to.
227 253
228=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
229 255
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
231returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
233 277
234=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
235 279
236This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
245 289
246=back 290=back
247 291
248=cut 292=cut
249 293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
250$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 301 my $msg = join "", @_;
252 302
253 $msg .= "\n" 303 $msg .= "\n"
254 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
255 305
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 307
258 LOG llevError, $msg; 308 LOG llevWarn, $msg;
259}; 309};
260 310
261$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
263 313
264 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
265 315
266 if ($Coro::current == $Coro::main) {#d# 316 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 318 return;#d#
269 }#d# 319 }#d#
270 320
271 # kill coroutine otherwise 321 # kill coroutine otherwise
272 Coro::terminate 322 Coro::terminate
292)) { 342)) {
293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294} 344}
295 345
296$EV::DIED = sub { 346$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
298}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
299 354
300############################################################################# 355#############################################################################
301 356
302=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
303 358
324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325 $d 380 $d
326 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
327} 382}
328 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
329=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
330 437
331Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
332 439
333=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 447
341sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
343 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
344=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
345 483
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
348 486
349The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 488is a reload or not.
351 489
352=cut 490=cut
353 491
354sub post_init(&) { 492sub post_init(&) {
355 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
356} 511}
357 512
358=item cf::lock_wait $string 513=item cf::lock_wait $string
359 514
360Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
413 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
414} 569}
415 570
416=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
417 572
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
421 580
422The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
424 583
425Useful for short background jobs. 584Useful for short background jobs.
454 } 613 }
455 } 614 }
456 615
457 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
459 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 619 } else {
462 $busy = 0; 620 $busy = 0;
463 Coro::schedule; 621 Coro::schedule;
464 } 622 }
465 } 623 }
505=cut 663=cut
506 664
507sub sync_job(&) { 665sub sync_job(&) {
508 my ($job) = @_; 666 my ($job) = @_;
509 667
510 if ($Coro::current == $Coro::main) { 668 if (in_main) {
511 my $time = AE::time; 669 my $time = AE::time;
512 670
513 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
515 673
516 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
517 675
518 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
519 677
520 my $busy = 1; 678 my $busy = 1;
521 my @res; 679 my @res;
522 680
523 (async { 681 (async {
524 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 683 @res = eval { $job->() };
526 warn $@ if $@; 684 error $@ if $@;
527 undef $busy; 685 undef $busy;
528 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
529 687
530 while ($busy) { 688 while ($busy) {
531 if (Coro::nready) { 689 if (Coro::nready) {
565 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
566 724
567 $coro 725 $coro
568} 726}
569 727
570=item fork_call { }, $args 728=item fork_call { }, @args
571 729
572Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 733never block itself or use any form of event handling.
576 734
577=cut 735=cut
578 736
737sub post_fork {
738 reset_signals;
739}
740
579sub fork_call(&@) { 741sub fork_call(&@) {
580 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
581 743
582 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious)
585
586 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
587 reset_signals; 745 cf::post_fork;
588 &$cb 746 &$cb
589 }, @args; 747 } @args;
590 748
591 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
592} 750}
593 751
594sub objinfo { 752sub objinfo {
644within each server. 802within each server.
645 803
646=cut 804=cut
647 805
648sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
649 my ($name) = @_; 810 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
651 812
652 eval { 813 eval {
653 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
663} 824}
664 825
665our $DB; 826our $DB;
666 827
667sub db_init { 828sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
670 };
671} 830}
672 831
673sub db_get($$) { 832sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
675 834
676 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
677 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
678 839
679 $! ? () 840 $! ? ()
680 : $data 841 : $data
681 }
682} 842}
683 843
684sub db_put($$$) { 844sub db_put($$$) {
685 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
714 874
715 my @data; 875 my @data;
716 my $md5; 876 my $md5;
717 877
718 for (0 .. $#$src) { 878 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 880 }
722 881
723 # if processing is expensive, check 882 # if processing is expensive, check
724 # checksum first 883 # checksum first
725 if (1) { 884 if (1) {
738 897
739 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
740 } 899 }
741 } 900 }
742 901
743 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
744 my $data = $process->(\@data); 903 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
746 905
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 907
749 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
752 911
762 921
763=cut 922=cut
764 923
765sub datalog($@) { 924sub datalog($@) {
766 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 927}
769 928
770=back 929=back
771 930
772=cut 931=cut
967 1126
968 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1129
971 } elsif (ref $type) { 1130 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
973 1132
974 } else { 1133 } else {
975 shift @arg; 1134 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
977 } 1136 }
978 } 1137 }
979} 1138}
980 1139
981sub _object_attach { 1140sub _object_attach {
991 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
992 } 1151 }
993 1152
994 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
995 } else { 1154 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1156 }
998 1157
999 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
1000} 1159}
1001 1160
1060 1219
1061 for (@$callbacks) { 1220 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1063 1222
1064 if ($@) { 1223 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1225 override;
1068 } 1226 }
1069 1227
1070 return 1 if $override; 1228 return 1 if $override;
1071 } 1229 }
1150 for (@$attach) { 1308 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1153 } 1311 }
1154 } else { 1312 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1314 }
1157 } 1315 }
1158} 1316}
1159 1317
1160cf::attachable->attach ( 1318cf::attachable->attach (
1187 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1188 1346
1189 sync_job { 1347 sync_job {
1190 if (length $$rdata) { 1348 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1194 1353
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
1220 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1221 1380
1222 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1383 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1226 } 1385 }
1227 } else { 1386 } else {
1228 aio_unlink $filename; 1387 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1230 } 1389 }
1254 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1414 $av = $st->{objs};
1256 } 1415 }
1257 1416
1258 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1261 1421
1262 ($data, $av) 1422 ($data, $av)
1263} 1423}
1264 1424
1265=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1269=cut 1429=cut
1270 1430
1271############################################################################# 1431#############################################################################
1272# command handling &c 1432# command handling &c
1273 1433
1274=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1275 1435
1276Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1277$name. 1437$name.
1278 1438
1279=cut 1439=cut
1285 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1286 1446
1287 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1288} 1448}
1289 1449
1290=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1291 1451
1292Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1293extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1294received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1295the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1296has logged in successfully. 1456has logged in successfully.
1297 1457
1298If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1299called.
1300 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1301=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1302 1466
1303Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1304exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1305are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1306is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1307log-in. 1471log-in.
1308 1472
1309If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1310called.
1311 1474
1312=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1313 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1314sub register_extcmd { 1482sub register_extcmd($$) {
1315 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1316 1484
1317 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1318} 1486}
1319 1487
1320sub register_exticmd { 1488sub register_async_extcmd($$) {
1321 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1322 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1323 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1324} 1504}
1325 1505
1326use File::Glob (); 1506use File::Glob ();
1327 1507
1328cf::player->attach ( 1508cf::player->attach (
1342 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1343 1523
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1525
1346 if (ref $msg) { 1526 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1528
1352 my @reply;
1353
1354 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1355 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1356 } 1547 }
1357 1548
1358 $pl->ext_reply ($reply, @reply)
1359 if $reply;
1360
1361 } else { 1549 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1551 }
1364 1552
1365 cf::override; 1553 cf::override;
1366 }, 1554 },
1367); 1555);
1377 }; 1565 };
1378 1566
1379 $grp 1567 $grp
1380} 1568}
1381 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1382sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1383 cf::sync_job { 1586 cf::sync_job {
1384 my %todo; 1587 my %todo;
1385 1588
1386 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1590 next unless -r $path;
1405 1608
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1611
1409 $ext{source} = 1612 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1412 . $source 1615 . $source
1413 . "\n};\n1"; 1616 . "\n};\n1";
1414 1617
1415 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1427 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1631 next ext
1429 unless exists $done{$_}; 1632 unless exists $done{$_};
1430 } 1633 }
1431 1634
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1434 my $active = eval $v->{source}; 1646 my $active = eval $source;
1435 1647
1436 if (length $@) { 1648 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1438 1650
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1652 if exists $v->{meta}{mandatory};
1653
1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1441 } else { 1656 } else {
1442 $done{$k} = delete $todo{$k}; 1657 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1658 push @EXTS, $v->{pkg};
1444 $progress = 1; 1659 $progress = 1;
1445 1660
1446 warn "$v->{base}: extension inactive.\n" 1661 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1662 unless $active;
1448 } 1663 }
1449 } 1664 }
1450 1665
1451 unless ($progress) { 1666 unless ($progress) {
1453 1668
1454 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1457 } 1672 }
1673
1674 last;
1458 } 1675 }
1459 } 1676 }
1460 }; 1677 };
1461} 1678}
1462 1679
1620 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1621 1838
1622 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1841
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1843 $pl->deactivate;
1844
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1630 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1631 1850
1632 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1688 \@logins 1907 \@logins
1689} 1908}
1690 1909
1691=item $player->maps 1910=item $player->maps
1692 1911
1912=item cf::player::maps $login
1913
1693Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1694player. May block. 1915player. May block.
1695 1916
1696=cut 1917=cut
1697 1918
1718 1939
1719=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1720 1941
1721Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1722 1943
1723=item $player->ext_reply ($msgid, @msg)
1724
1725Sends an ext reply to the player.
1726
1727=cut
1728
1729sub ext_reply($$@) {
1730 my ($self, $id, @msg) = @_;
1731
1732 $self->ns->ext_reply ($id, @msg)
1733}
1734
1735=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1736 1945
1737Sends an ext event to the client. 1946Sends an ext event to the client.
1738 1947
1739=cut 1948=cut
1758 1967
1759=cut 1968=cut
1760 1969
1761sub find_by_path($) { 1970sub find_by_path($) {
1762 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1763 1974
1764 my ($match, $specificity); 1975 my ($match, $specificity);
1765 1976
1766 for my $region (list) { 1977 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1796sub generate_random_map { 2007sub generate_random_map {
1797 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1798 2009
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800 2011
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 2013}
1816 2014
1817=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1818 2016
1819Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1824 2022
1825sub register { 2023sub register {
1826 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 2025 my $pkg = caller;
1828 2026
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 2028
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 2030}
1834 2031
1835# also paths starting with '/' 2032# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 2034
1838sub thawer_merge { 2035sub thawer_merge {
1839 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1840 2037
1841 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1846} 2043}
1847 2044
1848sub normalise { 2045sub normalise {
1849 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1850 2047
1851 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1852 2049
1853 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1854 2051
1855 # map plan: 2052 # map plan:
1856 # 2053 #
1871 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 2069 $path = "$base/$path";
1873 } 2070 }
1874 2071
1875 for ($path) { 2072 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1879 } 2075 }
1880 2076
1881 $path 2077 $path
1895 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1896 return $self; 2092 return $self;
1897 } 2093 }
1898 } 2094 }
1899 2095
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 2097 ()
1902} 2098}
1903 2099
2100# may re-bless or do other evil things
1904sub init { 2101sub init {
1905 my ($self) = @_; 2102 my ($self) = @_;
1906 2103
1907 $self 2104 $self
1908} 2105}
1973 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1974 2171
1975 1 2172 1
1976} 2173}
1977 2174
2175# used to laod the header of an original map
1978sub load_header_orig { 2176sub load_header_orig {
1979 my ($self) = @_; 2177 my ($self) = @_;
1980 2178
1981 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1982} 2180}
1983 2181
2182# used to laod the header of an instantiated map
1984sub load_header_temp { 2183sub load_header_temp {
1985 my ($self) = @_; 2184 my ($self) = @_;
1986 2185
1987 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1988} 2187}
1989 2188
2189# called after loading the header from an instantiated map
1990sub prepare_temp { 2190sub prepare_temp {
1991 my ($self) = @_; 2191 my ($self) = @_;
1992 2192
1993 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1995 # safety 2195 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2198}
1999 2199
2200# called after loading the header from an original map
2000sub prepare_orig { 2201sub prepare_orig {
2001 my ($self) = @_; 2202 my ($self) = @_;
2002 2203
2003 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2028 2229
2029sub find; 2230sub find;
2030sub find { 2231sub find {
2031 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2032 2233
2234 cf::cede_to_tick;
2235
2033 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2034 2237
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2240
2038 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2069 2272
2070 { 2273 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2072 2275
2073 return unless $self->valid; 2276 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2278
2078 $self->alloc; 2279 $self->alloc;
2079 2280
2080 $self->pre_load; 2281 $self->pre_load;
2081 cf::cede_to_tick; 2282 cf::cede_to_tick;
2082 2283
2284 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2286 $f->skip_block;
2085 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2086 or return; 2288 or return;
2087 2289
2088 $self->post_load_original 2290 $self->post_load_original
2089 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2090 2292
2091 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2294 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2297 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2098 } 2301 }
2099 } 2302 }
2100 }
2101 2303
2102 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2103 2311
2104 cf::cede_to_tick; 2312 cf::cede_to_tick;
2105 # now do the right thing for maps 2313 # now do the right thing for maps
2106 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2320 $self->decay_objects;
2113 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2114 $self->update_buttons; 2322 $self->update_buttons;
2115 cf::cede_to_tick; 2323 cf::cede_to_tick;
2116 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2117 } 2325 }
2118 2326
2119 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2329 }
2124 2330
2125 $self->post_load; 2331 $self->post_load;
2332
2333 1
2126} 2334}
2127 2335
2128# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2138# if $self->per_party; 2346# if $self->per_party;
2139 2347
2140 $self 2348 $self
2141} 2349}
2142 2350
2143# find and load all maps in the 3x3 area around a map
2144sub load_neighbours {
2145 my ($map) = @_;
2146
2147 my @neigh; # diagonal neighbours
2148
2149 for (0 .. 3) {
2150 my $neigh = $map->tile_path ($_)
2151 or next;
2152 $neigh = find $neigh, $map
2153 or next;
2154 $neigh->load;
2155
2156 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 }
2160
2161 for (grep defined $_->[0], @neigh) {
2162 my ($path, $origin) = @$_;
2163 my $neigh = find $path, $origin
2164 or next;
2165 $neigh->load;
2166 }
2167}
2168
2169sub find_sync { 2351sub find_sync {
2170 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2171 2353
2172 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2173} 2359}
2174 2360
2175sub do_load_sync { 2361sub do_load_sync {
2176 my ($map) = @_; 2362 my ($map) = @_;
2177 2363
2364 # it's a bug to call this from the main context
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2180 2367
2181 cf::sync_job { $map->load }; 2368 $map->load;
2182} 2369}
2183 2370
2184our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2186 2373
2187sub find_async { 2374sub find_async {
2188 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2189 2376
2190 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2191 2378
2192 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2194 } 2381 }
2195 2382
2196 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2197 2384
2198 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2212 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2213 2400
2214 () 2401 ()
2215} 2402}
2216 2403
2404# common code, used by both ->save and ->swapout
2217sub save { 2405sub _save {
2218 my ($self) = @_; 2406 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2407
2222 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2223 2409
2224 return unless $self->dirty; 2410 return unless $self->dirty;
2225 2411
2245 } else { 2431 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2433 }
2248} 2434}
2249 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2250sub swap_out { 2444sub swap_out {
2251 my ($self) = @_; 2445 my ($self) = @_;
2252 2446
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2258 return if $self->players; 2451 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2260 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2261 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2262 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2263 2503
2264 $self->deactivate; 2504 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2506 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2507
2312 $self->unlink_save; 2508 $self->unlink_save;
2313 $self->destroy; 2509 $self->destroy;
2314} 2510}
2315 2511
2323 2519
2324 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2325 2521
2326 $self->unlink_save; 2522 $self->unlink_save;
2327 2523
2328 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2529
2454 2650
2455Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2456 2652
2457=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2458 2654
2459returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2460even if the object actually exists. May block. 2656even if the object actually exists. May block.
2461 2657
2462=cut 2658=cut
2463 2659
2464sub deref { 2660sub deref {
2563 2759
2564Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2565 2761
2566The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2569map. 2765map.
2570 2766
2571Will never block. 2767Will never block.
2572 2768
2573=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2594sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2595 my ($self) = @_; 2791 my ($self) = @_;
2596 2792
2597 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2598 2794
2795 ++$self->{_link_recursion};
2796
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2798
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2603 2801
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2803}
2606 2804
2607sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2609 2807
2629 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2630 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2631 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2632 2830
2633 $map->load; 2831 $map->load;
2634 $map->load_neighbours;
2635 2832
2636 return unless $self->contr->active; 2833 return unless $self->contr->active;
2637 2834
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2640 2837 # entering was successful
2838 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2839 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2840 $self->activate_recursive;
2643} 2841 }
2644 2842
2843}
2844
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2846
2647Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2657 2857
2658our $GOTOGEN; 2858our $GOTOGEN;
2659 2859
2660sub cf::object::player::goto { 2860sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2662 2868
2663 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2871
2666 $self->enter_link; 2872 $self->enter_link;
2686 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2687 } 2893 }
2688 } 2894 }
2689 2895
2690 my $map = eval { 2896 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692 2898
2693 if ($map) { 2899 if ($map) {
2694 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2902 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2904 }
2699 2905
2700 $map 2906 $map
2708 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2711 } 2917 }
2712 2918
2713 $done->() if $done; 2919 $done->($self) if $done;
2714 })->prio (1); 2920 })->prio (1);
2715} 2921}
2716 2922
2717=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2718 2924
2786 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2787 2993
2788 unless (eval { 2994 unless (eval {
2789 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2790 2996
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2800 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2802 3023
2803 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2804 3025
2805 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2811 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2815 3036
2816 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 3038 $self->leave_link;
2818 } 3039 }
2819 })->prio (1); 3040 })->prio (1);
2820} 3041}
2821 3042
2979 id => "death", 3200 id => "death",
2980 title => "Death", 3201 title => "Death",
2981 reply => undef, 3202 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
2983 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
2984 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
2986); 3213);
2987 3214
2988sub cf::client::send_msg { 3215sub cf::client::send_msg {
3031=cut 3258=cut
3032 3259
3033sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
3034 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
3035 3262
3036 if ($self->extcmd == 2) {
3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3038 } elsif ($self->extcmd == 1) { # TODO: remove
3039 push @msg, msgtype => "event_$type";
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3041 }
3042}
3043
3044=item $client->ext_reply ($msgid, @msg)
3045
3046Sends an ext reply to the client.
3047
3048=cut
3049
3050sub cf::client::ext_reply($$@) {
3051 my ($self, $id, @msg) = @_;
3052
3053 if ($self->extcmd == 2) {
3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3055 } elsif ($self->extcmd == 1) {
3056 #TODO: version 1, remove
3057 unshift @msg, msgtype => "reply", msgid => $id;
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3059 }
3060} 3264}
3061 3265
3062=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
3063 3267
3064Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
3119 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
3120 3324
3121 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3122 3326
3123 if (ref $msg) { 3327 if (ref $msg) {
3124 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3125 "ARRAY" eq ref $msg
3126 ? @$msg
3127 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3128 3329
3129 my @reply;
3130
3131 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3132 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3133 } 3348 }
3134
3135 $ns->ext_reply ($reply, @reply)
3136 if $reply;
3137
3138 } else { 3349 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3351 }
3141 3352
3142 cf::override; 3353 cf::override;
3143 }, 3354 },
3144); 3355);
3225 decrease split destroy change_exp value msg lore send_msg)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3438 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3229) { 3440) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3443 for @funs;
3234} 3444}
3235 3445
3274 local @cf::_safe_eval_args = values %vars; 3484 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3485 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3486 }
3277 3487
3278 if ($@) { 3488 if ($@) {
3279 warn "$@"; 3489 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3282 } 3492 }
3283 3493
3284 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3285} 3495}
3286 3496
3311=cut 3521=cut
3312 3522
3313############################################################################# 3523#############################################################################
3314# the server's init and main functions 3524# the server's init and main functions
3315 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_csum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3316sub load_facedata($) { 3603sub load_facedata($) {
3317 my ($path) = @_; 3604 my ($path) = @_;
3318 3605
3319 # HACK to clear player env face cache, we need some signal framework
3320 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = ();
3322
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3607
3325 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3326 3609
3327 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3328 0 < aio_load $path, $facedata
3329 or die "$path: $!";
3330
3331 $facedata = Coro::Storable::thaw $facedata;
3332 3611
3333 $facedata->{version} == 2 3612 $facedata->{version} == 2
3334 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3335 3614
3336 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3338 $facedata->{resource}{"res/exp_table"} = { 3617
3339 type => FT_RSRC, 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3340 data => $exp_table, 3619
3341 hash => (Digest::MD5::md5 $exp_table), 3620 # BEGIN ATOMIC
3342 }; 3621 # from here on, everything must be atomic - no thread switch allowed
3343 cf::cede_to_tick; 3622 my $t1 = EV::time;
3344 3623
3345 { 3624 {
3346 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3347 3626
3348 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3349 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350 3630
3351 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3355 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3356 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3357 } 3638 }
3358 3639
3359 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3360 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3361 3642
3364 3645
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3649 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3651 }
3371
3372 cf::cede_to_tick;
3373 } 3652 }
3374 } 3653 }
3375 3654
3376 { 3655 {
3377 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3378 3657
3379 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3380 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3381 cf::cede_to_tick;
3382 } 3660 }
3383 3661
3384 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3385 } 3663 }
3386 3664
3387 { 3665 {
3388 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3389 3667
3390 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3672
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3396 } else { 3679 } else {
3397 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3398 } 3681 }
3399
3400 cf::cede_to_tick;
3401 } 3682 }
3402 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3403 3694
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3406 1 3699 1
3407} 3700}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3701
3429register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3431 3704
3432 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3440 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3442 cf::arch::commit_load; 3715 cf::arch::commit_load;
3443 3716
3444 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3445} 3732}
3446 3733
3447sub reload_regions { 3734sub reload_regions {
3448 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3449 # for this (global event?) 3736 # for this (global event?)
3457 if exists $_->{match}; 3744 if exists $_->{match};
3458 } 3745 }
3459} 3746}
3460 3747
3461sub reload_facedata { 3748sub reload_facedata {
3462 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3463 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3464} 3751}
3465 3752
3466sub reload_archetypes { 3753sub reload_archetypes {
3467 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3468 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3469} 3768}
3470 3769
3471sub reload_treasures { 3770sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3474} 3773}
3475 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3476sub reload_resources { 3795sub reload_resources {
3477 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3478 3797
3798 reload_materials;
3479 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3480 reload_archetypes; 3802 reload_archetypes;
3481 reload_regions; 3803 reload_regions;
3482 reload_treasures; 3804 reload_treasures;
3483 3805
3484 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3485} 3807}
3486 3808
3487sub reload_config { 3809sub reload_config {
3488 warn "reloading config file...\n"; 3810 trace "reloading config file...\n";
3489 3811
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3812 my $config = load_file "$CONFDIR/config";
3491 or return; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3492 3815
3493 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>;
3495
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3817
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3820
3501 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3823 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3824 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3825 };
3506 warn $@ if $@; 3826 warn $@ if $@;
3507 } 3827 }
3508
3509 warn "finished reloading resource files\n";
3510} 3828}
3511 3829
3512sub pidfile() { 3830sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3831 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3832 or die "$PIDFILE: $!";
3527 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3528 print $fh $$; 3846 print $fh $$;
3529} 3847}
3530 3848
3531sub main_loop { 3849sub main_loop {
3532 warn "EV::loop starting\n"; 3850 trace "EV::loop starting\n";
3533 if (1) { 3851 if (1) {
3534 EV::loop; 3852 EV::loop;
3535 } 3853 }
3536 warn "EV::loop returned\n"; 3854 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3855 goto &main_loop unless $REALLY_UNLOOP;
3538} 3856}
3539 3857
3540sub main { 3858sub main {
3541 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3542 3860
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547 3865
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549 3867
3550 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3551 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3553 (async { 3871 (async {
3554 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3556 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3557 }; 3875 };
3558 3876
3559 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3560 3878
3561 cf::sync_job { 3879 cf::sync_job {
3562 cf::init_experience; 3880 cf::incloader::init ();
3881
3882 db_init;
3883
3563 cf::init_anim; 3884 cf::init_anim;
3564 cf::init_attackmess; 3885 cf::init_attackmess;
3565 cf::init_dynamic; 3886 cf::init_dynamic;
3566 3887
3567 cf::load_settings; 3888 cf::load_settings;
3568 cf::load_materials;
3569 3889
3570 reload_resources; 3890 reload_resources;
3571 reload_config; 3891 reload_config;
3572 db_init;
3573 3892
3574 cf::init_uuid; 3893 cf::init_uuid;
3575 cf::init_signals; 3894 cf::init_signals;
3576 cf::init_skills; 3895 cf::init_skills;
3577 3896
3585 3904
3586 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3906 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3908
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3591 }; 3910 };
3592 3911
3593 cf::object::thawer::errors_are_fatal 0; 3912 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n"; 3913 info "parse errors in files are no longer fatal from this point on.\n";
3595 3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3596 main_loop; 3919 goto &main_loop;
3597} 3920}
3598 3921
3599############################################################################# 3922#############################################################################
3600# initialisation and cleanup 3923# initialisation and cleanup
3601 3924
3640 or return; 3963 or return;
3641 3964
3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3643 and return; 3966 and return;
3644 3967
3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3646 3969
3647 1 3970 1
3648} 3971}
3649 3972
3650our $uuid_lock; 3973our $uuid_lock;
3662 or return; 3985 or return;
3663 3986
3664 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3665 3988
3666 unless ($value) { 3989 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3668 return; 3991 return;
3669 } 3992 }
3670 3993
3671 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3672 $uuid_skip = 0; 3995 $uuid_skip = 0;
3682 or return; 4005 or return;
3683 4006
3684 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3685 and return; 4008 and return;
3686 4009
3687 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3688 4011
3689 1 4012 1
3690 4013
3691} 4014}
3692 4015
3698} 4021}
3699 4022
3700sub emergency_save() { 4023sub emergency_save() {
3701 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3702 4025
3703 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3704 4032
3705 cf::sync_job { 4033 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710 4035
3711 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3712 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3713 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3714 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3715 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3716 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3717 $pl->valid or next; 4042 $pl->valid or next;
3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3719 $pl->save; 4044 $pl->save;
3720 } 4045 }
3721 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3722 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3723 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3724 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3725 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3726 $map->valid or next; 4053 $map->valid or next;
3727 $map->save; 4054 $map->save;
3728 } 4055 }
3729 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3730 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3731 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3732 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3733 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3734 4063
3735 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3736 write_uuid_sync 1; 4065 write_uuid_sync 1;
3737 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3738 }; 4086 };
3739 4087
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3745 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3746} 4089}
3747 4090
3748sub post_cleanup { 4091sub post_cleanup {
3749 my ($make_core) = @_; 4092 my ($make_core) = @_;
3750 4093
4094 IO::AIO::flush;
4095
3751 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3752 if $make_core; 4097 if $make_core;
3753 4098
3754 my $fh = pidfile; 4099 my $fh = pidfile;
3755 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3756} 4101}
3776 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3778 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3779# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780 } 4125 }
3781 warn "cleared package $pkg\n";#d#
3782} 4126}
3783 4127
3784sub do_reload_perl() { 4128sub do_reload_perl() {
3785 # can/must only be called in main 4129 # can/must only be called in main
3786 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3787 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3788 return; 4132 return;
3789 } 4133 }
3790 4134
3791 return if $RELOAD++; 4135 return if $RELOAD++;
3792 4136
3793 my $t1 = AE::time; 4137 my $t1 = AE::time;
3794 4138
3795 while ($RELOAD) { 4139 while ($RELOAD) {
3796 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3797 4142
3798 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3799 4144
3800 cf::sync_job { 4145 cf::sync_job {
3801 cf::write_runtime_sync; # external watchdog should not bark
3802 cf::emergency_save; 4146 #cf::emergency_save;
3803 cf::write_runtime_sync; # external watchdog should not bark
3804 4147
3805 warn "syncing database to disk";
3806 BDB::db_env_txn_checkpoint $DB_ENV;
3807
3808 # if anything goes wrong in here, we should simply crash as we already saved
3809
3810 warn "flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3816 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3817 %EXT_CORO = (); 4150 %EXT_CORO = ();
3818 4151
3819 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3820 %COMMAND = (); 4153 %COMMAND = ();
3821 4154
3822 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3823 %EXTCMD = (); 4156 %EXTCMD = ();
3824 %EXTICMD = (); 4157 %EXTICMD = ();
3825 4158
3826 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3827 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3828 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3829 4162
3830 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3831 eval { 4164 eval {
3832 $cb->($pkg); 4165 $cb->($pkg);
3833 1 4166 1
3834 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3835 } 4168 }
3836 4169
3837 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3838 clear_package $pkg; 4171 clear_package $pkg;
3839 } 4172 }
3840 4173
3841 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3842 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3843 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844 4177
3845 warn "... unloading $k"; 4178 trace "... unloading $k";
3846 delete $INC{$k}; 4179 delete $INC{$k};
3847 4180
3848 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3849 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3850 4183
3853 } 4186 }
3854 4187
3855 clear_package $k; 4188 clear_package $k;
3856 } 4189 }
3857 4190
3858 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3859 clear_package "safe::$_" 4192 clear_package "safe::$_"
3860 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3861 4194
3862 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3863 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3865 4198
3866 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3867 # and global variables created in xs 4200 # and global variables created in xs
3868 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3869 4202
3870 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3871 4204
3872 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3873 require cf; 4206 require cf;
3874 cf::_connect_to_perl_1; 4207 cf::_connect_to_perl_1;
3875 4208
3876 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3877 cf::reload_config; 4210 cf::reload_config;
3878 4211
3879 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3880 cf::load_extensions; 4213 cf::load_extensions;
3881 4214
3882 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3883 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3884 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3885 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3886 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3887 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3888 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3889 } 4222 }
3890 4223
3891 warn "running post_init jobs"; 4224 cf::_post_init 1;
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3893 4225
3894 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3895 4227
3896 1 4228 1
3897 } or do { 4229 } or do {
3898 warn $@; 4230 error $@;
3899 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3900 }; 4232 };
3901 4233
3902 warn "reloaded";
3903 --$RELOAD; 4234 --$RELOAD;
3904 } 4235 }
3905 4236
3906 $t1 = AE::time - $t1; 4237 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3908}; 4239};
3909 4240
3910our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3911 4242
3912sub reload_perl() { 4243sub reload_perl() {
3933 reload_perl; 4264 reload_perl;
3934 }; 4265 };
3935 } 4266 }
3936}; 4267};
3937 4268
3938unshift @INC, $LIBDIR; 4269#############################################################################
3939 4270
3940my $bug_warning = 0; 4271my $bug_warning = 0;
3941 4272
3942our @WAIT_FOR_TICK;
3943our @WAIT_FOR_TICK_BEGIN;
3944
3945sub wait_for_tick { 4273sub wait_for_tick() {
3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3947 4275
3948 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3949 push @WAIT_FOR_TICK, $signal;
3950 $signal->wait;
3951} 4277}
3952 4278
3953sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3955 4281
3956 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3957 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3958 $signal->wait; 4284 $signal->wait;
3959} 4285}
3963 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3964 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3965 return; 4291 return;
3966 } 4292 }
3967 4293
3968 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
3969 4295
3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3971 4297
3972 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3974 Coro::async_pool { 4300 Coro::async_pool {
3975 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3976 write_runtime_sync 4302 write_runtime_sync
3977 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3978 }; 4304 };
3979 } 4305 }
3980 4306
3981 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3982 $sig->send; 4308 $sig->send;
3983 } 4309 }
3984 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3985 $sig->send;
3986 }
3987 4311
3988 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3989 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3990 4314
3991 if (0) { 4315 if (0) {
3992 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3993 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3994 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3995 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3996 } 4320 }
3997 } 4321 }
3998} 4322}
3999 4323
4000{ 4324{
4001 # configure BDB 4325 # configure BDB
4326 info "initialising database";
4002 4327
4003 BDB::min_parallel 16; 4328 BDB::min_parallel 16;
4004 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
4005 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
4006 4331
4007 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
4008 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
4009 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4010 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4035 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4036 }; 4361 };
4037 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4038 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4039 }; 4364 };
4365
4366 info "database initialised";
4040} 4367}
4041 4368
4042{ 4369{
4043 # configure IO::AIO 4370 # configure IO::AIO
4044 4371
4372 info "initialising aio";
4045 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
4046 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
4047 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
4048} 4377}
4049 4378
4050my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
4051 4381
4052sub _log_backtrace { 4382sub _log_backtrace {
4053 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
4054 4384
4055 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
4056 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4057 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
4058 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
4059 ++$_log_backtrace; 4393 ++$_log_backtrace;
4060 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
4061 async { 4395 async {
4062 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
4063 4397
4083 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
4084 --$_log_backtrace; 4418 --$_log_backtrace;
4085 }; 4419 };
4086 } else { 4420 } else {
4087 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
4088 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4089 } 4423 }
4090} 4424}
4091 4425
4092# load additional modules 4426# load additional modules
4093require "cf/$_.pm" for @EXTRA_MODULES; 4427require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines