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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 6#
6# Deliantra is free software: you can redistribute it and/or modify 7# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 8# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 9# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 10# option) any later version.
10# 11#
11# This program is distributed in the hope that it will be useful, 12# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 15# GNU General Public License for more details.
15# 16#
16# You should have received a copy of the GNU General Public License 17# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 18# and the GNU General Public License along with this program. If not, see
18# 19# <http://www.gnu.org/licenses/>.
20#
19# The authors can be reached via e-mail to <support@deliantra.net> 21# The authors can be reached via e-mail to <support@deliantra.net>
20# 22#
21 23
22package cf; 24package cf;
23 25
24use 5.10.0; 26use common::sense;
25use utf8;
26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36
37use Guard (); 36use Carp ();
37
38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
38use Coro (); 42use Coro ();
39use Coro::State; 43use Coro::State;
40use Coro::Handle; 44use Coro::Handle;
41use Coro::EV; 45use Coro::EV;
42use Coro::AnyEvent; 46use Coro::AnyEvent;
48use Coro::AIO; 52use Coro::AIO;
49use Coro::BDB 1.6; 53use Coro::BDB 1.6;
50use Coro::Storable; 54use Coro::Storable;
51use Coro::Util (); 55use Coro::Util ();
52 56
57use Guard ();
53use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
54use BDB (); 59use BDB ();
55use Data::Dumper; 60use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 61use Fcntl;
58use YAML (); 62use YAML::XS ();
63use CBOR::XS ();
59use IO::AIO (); 64use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 65use Compress::LZF;
62use Digest::MD5 (); 66use Digest::MD5 ();
63 67
64AnyEvent::detect; 68AnyEvent::detect;
65 69
77# strictly for debugging 81# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 82$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 83
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 84sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 85
86our @ORIG_INC;
87
82our %COMMAND = (); 88our %COMMAND = ();
83our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
84 90
85our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
87our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
90 98
91our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 100our @EVENT;
93our @REFLECT; # set by XS 101our @REFLECT; # set by XS
94our %REFLECT; # set by us 102our %REFLECT; # set by us
95 103
96our $CONFDIR = confdir; 104our $CONFDIR = confdir;
105
97our $DATADIR = datadir; 106our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 107our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 108our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 109our $MAPDIR = "$DATADIR/" . mapdir;
110
101our $LOCALDIR = localdir; 111our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 112our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 113our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 114our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 115our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 116our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 117our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 118our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 119
110our %RESOURCE; 120#our %RESOURCE; # unused
121
122our $OUTPUT_RATE_MIN = 3000;
123our $OUTPUT_RATE_MAX = 1000000;
124
125our $MAX_LINKS = 32; # how many chained exits to follow
126our $VERBOSE_IO = 1;
111 127
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 128our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 129our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 130our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 131our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 133our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 134our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 135our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 136our $DB_ENV;
121 137
122our @EXTRA_MODULES = qw(pod mapscript); 138our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 139
124our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
125 142
126our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 144our $RUNTIME = 0;
145our $SERVER_TICK = 0;
128our $NOW; 146our $NOW;
129 147
130our (%PLAYER, %PLAYER_LOADING); # all users 148our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 149our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 150our $LINK_MAP; # the special {link} map, which is always available
141 159
142our @POST_INIT; 160our @POST_INIT;
143 161
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 162our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :) 163our $REALLY_UNLOOP; # never set to true, please :)
164
165our $WAIT_FOR_TICK = new Coro::Signal;
166our @WAIT_FOR_TICK_BEGIN;
146 167
147binmode STDOUT; 168binmode STDOUT;
148binmode STDERR; 169binmode STDERR;
149 170
150# read virtual server time, if available 171# read virtual server time, if available
161 182
162our $EMERGENCY_POSITION; 183our $EMERGENCY_POSITION;
163 184
164sub cf::map::normalise; 185sub cf::map::normalise;
165 186
187sub in_main() {
188 $Coro::current == $Coro::main
189}
190
166############################################################################# 191#############################################################################
167 192
168%REFLECT = (); 193%REFLECT = ();
169for (@REFLECT) { 194for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 195 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 196 $REFLECT{$reflect->{class}} = $reflect;
172} 197}
173 198
174# this is decidedly evil 199# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 200$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 201
177############################################################################# 202#############################################################################
178 203
179=head2 GLOBAL VARIABLES 204=head2 GLOBAL VARIABLES
180 205
181=over 4 206=over 4
182 207
183=item $cf::UPTIME 208=item $cf::UPTIME
184 209
185The timestamp of the server start (so not actually an uptime). 210The timestamp of the server start (so not actually an "uptime").
211
212=item $cf::SERVER_TICK
213
214An unsigned integer that starts at zero when the server is started and is
215incremented on every tick.
216
217=item $cf::NOW
218
219The (real) time of the last (current) server tick - updated before and
220after tick processing, so this is useful only as a rough "what time is it
221now" estimate.
222
223=item $cf::TICK
224
225The interval between each server tick, in seconds.
186 226
187=item $cf::RUNTIME 227=item $cf::RUNTIME
188 228
189The time this server has run, starts at 0 and is increased by $cf::TICK on 229The time this server has run, starts at 0 and is increased by $cf::TICK on
190every server tick. 230every server tick.
191 231
192=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
193$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
194$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
195 235
196Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
199database environment. 239database environment.
200 240
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 241=item $cf::LOADAVG
210 242
211The current CPU load on the server (alpha-smoothed), as a value between 0 243The current CPU load on the server (alpha-smoothed), as a value between 0
212(none) and 1 (overloaded), indicating how much time is spent on processing 244(none) and 1 (overloaded), indicating how much time is spent on processing
213objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
221Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
222from wherever your confdir points to. 254from wherever your confdir points to.
223 255
224=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
225 257
226These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 258These are functions that inhibit the current coroutine one tick.
227returns directly I<after> the tick processing (and consequently, can only wake one process 259cf::wait_for_tick_begin only returns directly I<after> the tick
260processing (and consequently, can only wake one thread per tick), while
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 261cf::wait_for_tick wakes up all waiters after tick processing.
262
263Note that cf::wait_for_tick will immediately return when the server is not
264ticking, making it suitable for small pauses in threads that need to run
265when the server is paused. If that is not applicable (i.e. you I<really>
266want to wait, use C<$cf::WAIT_FOR_TICK>).
267
268=item $cf::WAIT_FOR_TICK
269
270Note that C<cf::wait_for_tick> is probably the correct thing to use. This
271variable contains a L<Coro::Signal> that is broadcats after every server
272tick. Calling C<< ->wait >> on it will suspend the caller until after the
273next server tick.
274
275=cut
276
277sub wait_for_tick();
278sub wait_for_tick_begin();
229 279
230=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
231 281
232This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 283C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 284that call.
235 285
236=item %cf::REFLECT 286=item %cf::REFLECT
237 287
241 291
242=back 292=back
243 293
244=cut 294=cut
245 295
296sub error(@) { LOG llevError, join "", @_ }
297sub warn (@) { LOG llevWarn , join "", @_ }
298sub info (@) { LOG llevInfo , join "", @_ }
299sub debug(@) { LOG llevDebug, join "", @_ }
300sub trace(@) { LOG llevTrace, join "", @_ }
301
246$Coro::State::WARNHOOK = sub { 302$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 303 my $msg = join "", @_;
248 304
249 $msg .= "\n" 305 $msg .= "\n"
250 unless $msg =~ /\n$/; 306 unless $msg =~ /\n$/;
251 307
252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 308 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253 309
254 LOG llevError, $msg; 310 LOG llevWarn, $msg;
255}; 311};
256 312
257$Coro::State::DIEHOOK = sub { 313$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 314 return unless $^S eq 0; # "eq", not "=="
259 315
260 warn Carp::longmess $_[0]; 316 error Carp::longmess $_[0];
261 317
262 if ($Coro::current == $Coro::main) {#d# 318 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 319 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 320 return;#d#
265 }#d# 321 }#d#
266 322
267 # kill coroutine otherwise 323 # kill coroutine otherwise
268 Coro::terminate 324 Coro::terminate
288)) { 344)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 346}
291 347
292$EV::DIED = sub { 348$EV::DIED = sub {
293 warn "error in event callback: @_"; 349 warn "error in event callback: $@";
294}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
295 356
296############################################################################# 357#############################################################################
297 358
298=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
299 360
320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 381 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
321 $d 382 $d
322 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
323} 384}
324 385
386=item $scalar = cf::load_file $path
387
388Loads the given file from path and returns its contents. Croaks on error
389and can block.
390
391=cut
392
393sub load_file($) {
394 0 <= aio_load $_[0], my $data
395 or Carp::croak "$_[0]: $!";
396
397 $data
398}
399
400=item $success = cf::replace_file $path, $data, $sync
401
402Atomically replaces the file at the given $path with new $data, and
403optionally $sync the data to disk before replacing the file.
404
405=cut
406
407sub replace_file($$;$) {
408 my ($path, $data, $sync) = @_;
409
410 my $lock = cf::lock_acquire ("replace_file:$path");
411
412 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
413 or return;
414
415 $data = $data->() if ref $data;
416
417 length $data == aio_write $fh, 0, (length $data), $data, 0
418 or return;
419
420 !$sync
421 or !aio_fsync $fh
422 or return;
423
424 aio_close $fh
425 and return;
426
427 aio_rename "$path~", $path
428 and return;
429
430 if ($sync) {
431 $path =~ s%/[^/]*$%%;
432 aio_pathsync $path;
433 }
434
435 1
436}
437
325=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
326 439
327Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
328 441
329=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 448our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336 449
337sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
339 452
453=item $ref = cf::decode_storable $scalar
454
455Same as Coro::Storable::thaw, so blocks.
456
457=cut
458
459BEGIN { *decode_storable = \&Coro::Storable::thaw }
460
461=item $ref = cf::decode_yaml $scalar
462
463Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
464
465=cut
466
467sub decode_yaml($) {
468 fork_call { YAML::XS::Load $_[0] } @_
469}
470
471=item $scalar = cf::decode_cbor $scalar
472
473Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
474blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
475alternative.
476
477=cut
478
479sub decode_cbor($) {
480 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
481 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
482 CBOR::XS::decode_cbor $_[0]
483}
484
485=item $scalar = cf::unlzf $scalar
486
487Same as Compress::LZF::compress, but takes server ticks into account, so
488blocks.
489
490=cut
491
492sub unlzf($) {
493 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
494 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
495 Compress::LZF::decompress $_[0]
496}
497
340=item cf::post_init { BLOCK } 498=item cf::post_init { BLOCK }
341 499
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 500Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 501but I<before> the server starts ticking again.
344 502
345The cdoeblock will have a single boolean argument to indicate whether this 503The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 504is a reload or not.
347 505
348=cut 506=cut
349 507
350sub post_init(&) { 508sub post_init(&) {
351 push @POST_INIT, shift; 509 push @POST_INIT, shift;
352} 510}
353 511
512sub _post_init {
513 trace "running post_init jobs";
514
515 # run them in parallel...
516
517 my @join;
518
519 while () {
520 push @join, map &Coro::async ($_, 0), @POST_INIT;
521 @POST_INIT = ();
522
523 @join or last;
524
525 (pop @join)->join;
526 }
527}
528
354=item cf::lock_wait $string 529=item cf::lock_wait $string
355 530
356Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
357 532
358=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
359 534
360Wait until the given lock is available and then acquires it and returns 535Wait until the given lock is available and then acquires it and returns
361a L<Guard> object. If the guard object gets destroyed (goes out of scope, 536a L<Guard> object. If the guard object gets destroyed (goes out of scope,
395} 570}
396 571
397=item cf::periodic $interval, $cb 572=item cf::periodic $interval, $cb
398 573
399Like EV::periodic, but randomly selects a starting point so that the actions 574Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 575get spread over time.
401 576
402=cut 577=cut
403 578
404sub periodic($$) { 579sub periodic($$) {
405 my ($interval, $cb) = @_; 580 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
410} 585}
411 586
412=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
413 588
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
415This call blocks and returns only when you have at least C<$time> seconds 590(default: 0): This call blocks and returns only when you have at least
416of cpu time till the next tick. The slot is only valid till the next cede. 591C<$time> seconds of cpu time till the next tick. The slot is only valid
592till the next cede.
593
594Background jobs should use a priority less than zero, interactive jobs
595should use 100 or more.
417 596
418The optional C<$name> can be used to identify the job to run. It might be 597The optional C<$name> can be used to identify the job to run. It might be
419used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
420 599
421Useful for short background jobs. 600Useful for short background jobs.
422 601
423=cut 602=cut
424 603
425our @SLOT_QUEUE; 604our @SLOT_QUEUE;
426our $SLOT_QUEUE; 605our $SLOT_QUEUE;
606our $SLOT_DECAY = 0.9;
427 607
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 608$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 609$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 610 $Coro::current->desc ("timeslot manager");
431 611
432 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
613 my $busy;
433 614
434 while () { 615 while () {
435 next_job: 616 next_job:
617
618 Coro::cede;
619
436 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 621
438 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
624 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 626 $job->[2]->send;
442 Coro::cede;
443 goto next_job; 627 goto next_job;
444 } 628 } else {
629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 630 }
446 } 631 }
447 632
448 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
450 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait;
452 } else { 635 } else {
636 $busy = 0;
453 Coro::schedule; 637 Coro::schedule;
454 } 638 }
455 } 639 }
456}; 640};
457 641
458sub get_slot($;$$) { 642sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 643 return if tick_inhibit || $Coro::current == $Coro::main;
460 644
461 my ($time, $pri, $name) = @_; 645 my ($time, $pri, $name) = @_;
462 646
463 $time = $TICK * .6 if $time > $TICK * .6; 647 $time = clamp $time, 0.01, $TICK * .6;
648
464 my $sig = new Coro::Signal; 649 my $sig = new Coro::Signal;
465 650
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 651 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 652 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 653 $SLOT_QUEUE->ready;
480BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
481 666
482=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
483 668
484The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
485is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
486partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 671partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
487acceptable. 672acceptable.
488 673
489If it must be done, put the blocking parts into C<sync_job>. This will run 674If it must be done, put the blocking parts into C<sync_job>. This will run
490the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
494=cut 679=cut
495 680
496sub sync_job(&) { 681sub sync_job(&) {
497 my ($job) = @_; 682 my ($job) = @_;
498 683
499 if ($Coro::current == $Coro::main) { 684 if (in_main) {
500 my $time = EV::time; 685 my $time = AE::time;
501 686
502 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
504 689
505 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
506 691
507 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
508 693
509 my $busy = 1; 694 my $busy = 1;
510 my @res; 695 my @res;
511 696
512 (async { 697 (async {
513 $Coro::current->desc ("sync job coro"); 698 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 699 @res = eval { $job->() };
515 warn $@ if $@; 700 error $@ if $@;
516 undef $busy; 701 undef $busy;
517 })->prio (Coro::PRIO_MAX); 702 })->prio (Coro::PRIO_MAX);
518 703
519 while ($busy) { 704 while ($busy) {
520 if (Coro::nready) { 705 if (Coro::nready) {
521 Coro::cede_notself; 706 Coro::cede_notself;
522 } else { 707 } else {
523 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
524 } 709 }
525 } 710 }
526 711
527 my $time = EV::time - $time; 712 my $time = AE::time - $time;
528 713
529 $TICK_START += $time; # do not account sync jobs to server load 714 $TICK_START += $time; # do not account sync jobs to server load
530 715
531 wantarray ? @res : $res[0] 716 wantarray ? @res : $res[0]
532 } else { 717 } else {
554 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
555 740
556 $coro 741 $coro
557} 742}
558 743
559=item fork_call { }, $args 744=item fork_call { }, @args
560 745
561Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 749never block itself or use any form of event handling.
565 750
566=cut 751=cut
567 752
753sub post_fork {
754 reset_signals;
755}
756
568sub fork_call(&@) { 757sub fork_call(&@) {
569 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
570 759
571 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious)
574
575 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
576 reset_signals; 761 cf::post_fork;
577 &$cb 762 &$cb
578 }, @args; 763 } @args;
579 764
580 wantarray ? @res : $res[-1] 765 wantarray ? @res : $res[-1]
766}
767
768sub objinfo {
769 (
770 "counter value" => cf::object::object_count,
771 "objects created" => cf::object::create_count,
772 "objects destroyed" => cf::object::destroy_count,
773 "freelist size" => cf::object::free_count,
774 "allocated objects" => cf::object::objects_size,
775 "active objects" => cf::object::actives_size,
776 )
581} 777}
582 778
583=item $coin = coin_from_name $name 779=item $coin = coin_from_name $name
584 780
585=cut 781=cut
622within each server. 818within each server.
623 819
624=cut 820=cut
625 821
626sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
627 my ($name) = @_; 826 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
629 828
630 eval { 829 eval {
631 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
641} 840}
642 841
643our $DB; 842our $DB;
644 843
645sub db_init { 844sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
648 };
649} 846}
650 847
651sub db_get($$) { 848sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
653 850
654 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
655 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
656 855
657 $! ? () 856 $! ? ()
658 : $data 857 : $data
659 }
660} 858}
661 859
662sub db_put($$$) { 860sub db_put($$$) {
663 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 890
693 my @data; 891 my @data;
694 my $md5; 892 my $md5;
695 893
696 for (0 .. $#$src) { 894 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 896 }
700 897
701 # if processing is expensive, check 898 # if processing is expensive, check
702 # checksum first 899 # checksum first
703 if (1) { 900 if (1) {
716 913
717 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
718 } 915 }
719 } 916 }
720 917
721 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
722 my $data = $process->(\@data); 919 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
724 921
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 923
727 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 926 db_put cache => "$id/meta", $meta;
730 927
740 937
741=cut 938=cut
742 939
743sub datalog($@) { 940sub datalog($@) {
744 my ($type, %kv) = @_; 941 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 942 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 943}
747 944
748=back 945=back
749 946
750=cut 947=cut
945 1142
946 } elsif (exists $cb_id{$type}) { 1143 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1144 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1145
949 } elsif (ref $type) { 1146 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1147 error "attaching objects not supported, ignoring.\n";
951 1148
952 } else { 1149 } else {
953 shift @arg; 1150 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1151 error "attach argument '$type' not supported, ignoring.\n";
955 } 1152 }
956 } 1153 }
957} 1154}
958 1155
959sub _object_attach { 1156sub _object_attach {
969 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
970 } 1167 }
971 1168
972 $obj->{$name} = \%arg; 1169 $obj->{$name} = \%arg;
973 } else { 1170 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1171 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1172 }
976 1173
977 $obj->{_attachment}{$name} = undef; 1174 $obj->{_attachment}{$name} = undef;
978} 1175}
979 1176
1038 1235
1039 for (@$callbacks) { 1236 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1237 eval { &{$_->[1]} };
1041 1238
1042 if ($@) { 1239 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1240 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1241 override;
1046 } 1242 }
1047 1243
1048 return 1 if $override; 1244 return 1 if $override;
1049 } 1245 }
1128 for (@$attach) { 1324 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1325 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1326 _attach $registry, $klass, @attach;
1131 } 1327 }
1132 } else { 1328 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1329 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1330 }
1135 } 1331 }
1136} 1332}
1137 1333
1138cf::attachable->attach ( 1334cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1361 my ($filename, $rdata, $objs) = @_;
1166 1362
1167 sync_job { 1363 sync_job {
1168 if (length $$rdata) { 1364 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1365 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1366 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1367 $decname, length $$rdata, scalar @$objs
1368 if $VERBOSE_IO;
1172 1369
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1370 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1371 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1372 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1373 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1395 aio_rename "$filename~", $filename;
1199 1396
1200 $filename =~ s%/[^/]+$%%; 1397 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1398 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1399 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1400 error "unable to save objects: $filename~: $!\n";
1204 } 1401 }
1205 } else { 1402 } else {
1206 aio_unlink $filename; 1403 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1404 aio_unlink "$filename.pst";
1208 } 1405 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1429 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1430 $av = $st->{objs};
1234 } 1431 }
1235 1432
1236 utf8::decode (my $decname = $filename); 1433 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1434 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1435 $decname, length $data, scalar @{$av || []}
1436 if $VERBOSE_IO;
1239 1437
1240 ($data, $av) 1438 ($data, $av)
1241} 1439}
1242 1440
1243=head2 COMMAND CALLBACKS 1441=head2 COMMAND CALLBACKS
1247=cut 1445=cut
1248 1446
1249############################################################################# 1447#############################################################################
1250# command handling &c 1448# command handling &c
1251 1449
1252=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1253 1451
1254Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1255$name. 1453$name.
1256 1454
1257=cut 1455=cut
1263 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1264 1462
1265 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1266} 1464}
1267 1465
1268=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1269 1467
1270Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1271extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1272received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1273the logged-in player. Ext commands can only be processed after a player 1471the logged-in player. Ext commands can only be processed after a player
1274has logged in successfully. 1472has logged in successfully.
1275 1473
1276If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1277called.
1278 1475
1476=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1477
1478Same as C<cf::register_extcmd>, but instead of returning values, the
1479callback needs to clal the C<$reply> function.
1480
1279=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1280 1482
1281Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1282exticmd packet. Exti commands are processed by the server as soon as they 1484exticmd packet. Exti commands are processed by the server as soon as they
1283are received, i.e. out of order w.r.t. other commands. The first argument 1485are received, i.e. out of order w.r.t. other commands. The first argument
1284is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1285log-in. 1487log-in.
1286 1488
1287If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1288called.
1289 1490
1290=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1291 1492
1493Same as C<cf::register_extcmd>, but instead of returning values, the
1494callback needs to clal the C<$reply> function.
1495
1496=cut
1497
1292sub register_extcmd { 1498sub register_extcmd($$) {
1293 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1294 1500
1295 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1296} 1502}
1297 1503
1298sub register_exticmd { 1504sub register_async_extcmd($$) {
1299 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1300 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1301 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1302} 1514}
1303 1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1520}
1521
1304use File::Glob (); 1522use File::Glob ();
1305 1523
1306cf::player->attach ( 1524cf::player->attach (
1307 on_command => sub { 1525 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1526 my ($pl, $name, $params) = @_;
1309 1527
1310 my $cb = $COMMAND{$name} 1528 my $cb = $COMMAND{$name}
1311 or return; 1529 or return;
1312 1530
1320 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1321 1539
1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323 1541
1324 if (ref $msg) { 1542 if (ref $msg) {
1325 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329 1544
1330 my @reply;
1331
1332 if (my $cb = $EXTCMD{$type}) { 1545 if (my $cb = $EXTACMD{$type}) {
1546 $cb->(
1547 $pl,
1548 sub {
1549 $pl->ext_msg ("reply-$reply", @_)
1550 if $reply;
1551 },
1552 @payload
1553 );
1554 } else {
1555 my @reply;
1556
1557 if (my $cb = $EXTCMD{$type}) {
1333 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1334 } 1563 }
1335 1564
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
1339 } else { 1565 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1567 }
1342 1568
1343 cf::override; 1569 cf::override;
1344 }, 1570 },
1345); 1571);
1355 }; 1581 };
1356 1582
1357 $grp 1583 $grp
1358} 1584}
1359 1585
1586sub _ext_cfg_reg($$$$) {
1587 my ($rvar, $varname, $cfgname, $default) = @_;
1588
1589 $cfgname = lc $varname
1590 unless length $cfgname;
1591
1592 $EXT_CFG{$cfgname} = [$rvar, $default];
1593
1594 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1595}
1596
1360sub load_extensions { 1597sub load_extensions {
1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1601
1361 cf::sync_job { 1602 cf::sync_job {
1362 my %todo; 1603 my %todo;
1363 1604
1364 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1606 next unless -r $path;
1383 1624
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1627
1387 $ext{source} = 1628 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1390 . $source 1631 . $source
1391 . "\n};\n1"; 1632 . "\n};\n1";
1392 1633
1393 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1394 } 1635 }
1395 1636
1637 my $pass = 0;
1396 my %done; 1638 my %done;
1397 while (%todo) { 1639 while (%todo) {
1398 my $progress; 1640 my $progress;
1399 1641
1642 ++$pass;
1643
1644 ext:
1400 while (my ($k, $v) = each %todo) { 1645 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1646 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1647 next ext
1403 unless exists $done{$_}; 1648 unless exists $done{$_};
1404 } 1649 }
1405 1650
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1652
1408 unless (eval $v->{source}) { 1653 my $source = $v->{source};
1654
1655 # support "CONF varname :confname = default" pseudo-statements
1656 $source =~ s{
1657 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1658 }{
1659 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1660 }gmxe;
1661
1662 my $active = eval $source;
1663
1664 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1665 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1666
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1668 if exists $v->{meta}{mandatory};
1416 1669
1417 warn $msg; 1670 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1671 delete $todo{$k};
1672 } else {
1673 $done{$k} = delete $todo{$k};
1674 push @EXTS, $v->{pkg};
1675 $progress = 1;
1676
1677 info "$v->{base}: extension inactive.\n"
1678 unless $active;
1418 } 1679 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1680 }
1424 1681
1425 skip: 1682 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1683 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1684
1685 while (my ($k, $v) = each %todo) {
1686 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1687 if exists $v->{meta}{mandatory};
1688 }
1689
1690 last;
1691 }
1428 } 1692 }
1429 }; 1693 };
1430} 1694}
1431 1695
1432############################################################################# 1696#############################################################################
1516 $cf::PLAYER{$login} = $pl 1780 $cf::PLAYER{$login} = $pl
1517 } 1781 }
1518 } 1782 }
1519} 1783}
1520 1784
1785cf::player->attach (
1786 on_load => sub {
1787 my ($pl, $path) = @_;
1788
1789 # restore slots saved in save, below
1790 my $slots = delete $pl->{_slots};
1791
1792 $pl->ob->current_weapon ($slots->[0]);
1793 $pl->combat_ob ($slots->[1]);
1794 $pl->ranged_ob ($slots->[2]);
1795 },
1796);
1797
1521sub save($) { 1798sub save($) {
1522 my ($pl) = @_; 1799 my ($pl) = @_;
1523 1800
1524 return if $pl->{deny_save}; 1801 return if $pl->{deny_save};
1525 1802
1530 1807
1531 aio_mkdir playerdir $pl, 0770; 1808 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1809 $pl->{last_save} = $cf::RUNTIME;
1533 1810
1534 cf::get_slot 0.01; 1811 cf::get_slot 0.01;
1812
1813 # save slots, to be restored later
1814 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1815
1536 $pl->save_pl ($path); 1816 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1817 cf::cede_to_tick;
1538} 1818}
1539 1819
1573 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1574 1854
1575 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1856 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1857
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1859 $pl->deactivate;
1860
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1861 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1583 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1584 1866
1585 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1641 \@logins 1923 \@logins
1642} 1924}
1643 1925
1644=item $player->maps 1926=item $player->maps
1645 1927
1928=item cf::player::maps $login
1929
1646Returns an arrayref of map paths that are private for this 1930Returns an arrayref of map paths that are private for this
1647player. May block. 1931player. May block.
1648 1932
1649=cut 1933=cut
1650 1934
1671 1955
1672=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1673 1957
1674Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1675 1959
1676=item $player->ext_reply ($msgid, @msg)
1677
1678Sends an ext reply to the player.
1679
1680=cut
1681
1682sub ext_reply($$@) {
1683 my ($self, $id, @msg) = @_;
1684
1685 $self->ns->ext_reply ($id, @msg)
1686}
1687
1688=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1689 1961
1690Sends an ext event to the client. 1962Sends an ext event to the client.
1691 1963
1692=cut 1964=cut
1711 1983
1712=cut 1984=cut
1713 1985
1714sub find_by_path($) { 1986sub find_by_path($) {
1715 my ($path) = @_; 1987 my ($path) = @_;
1988
1989 $path =~ s/^~[^\/]*//; # skip ~login
1716 1990
1717 my ($match, $specificity); 1991 my ($match, $specificity);
1718 1992
1719 for my $region (list) { 1993 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1994 if ($region->{match} && $path =~ $region->{match}) {
1749sub generate_random_map { 2023sub generate_random_map {
1750 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1751 2025
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2026 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 2027
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 2029}
1769 2030
1770=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1771 2032
1772Register a handler for the map path matching the given regex at the 2033Register a handler for the map path matching the given regex at the
1777 2038
1778sub register { 2039sub register {
1779 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 2041 my $pkg = caller;
1781 2042
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 2044
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 2046}
1787 2047
1788# also paths starting with '/' 2048# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2049$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 2050
1791sub thawer_merge { 2051sub thawer_merge {
1792 my ($self, $merge) = @_; 2052 my ($self, $merge) = @_;
1793 2053
1794 # we have to keep some variables in memory intact 2054 # we have to keep some variables in memory intact
1799} 2059}
1800 2060
1801sub normalise { 2061sub normalise {
1802 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1803 2063
1804 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1805 2065
1806 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1807 2067
1808 # map plan: 2068 # map plan:
1809 # 2069 #
1824 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 2085 $path = "$base/$path";
1826 } 2086 }
1827 2087
1828 for ($path) { 2088 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1832 } 2091 }
1833 2092
1834 $path 2093 $path
1848 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1849 return $self; 2108 return $self;
1850 } 2109 }
1851 } 2110 }
1852 2111
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2113 ()
1855} 2114}
1856 2115
2116# may re-bless or do other evil things
1857sub init { 2117sub init {
1858 my ($self) = @_; 2118 my ($self) = @_;
1859 2119
1860 $self 2120 $self
1861} 2121}
1926 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1927 2187
1928 1 2188 1
1929} 2189}
1930 2190
2191# used to laod the header of an original map
1931sub load_header_orig { 2192sub load_header_orig {
1932 my ($self) = @_; 2193 my ($self) = @_;
1933 2194
1934 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
1935} 2196}
1936 2197
2198# used to laod the header of an instantiated map
1937sub load_header_temp { 2199sub load_header_temp {
1938 my ($self) = @_; 2200 my ($self) = @_;
1939 2201
1940 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
1941} 2203}
1942 2204
2205# called after loading the header from an instantiated map
1943sub prepare_temp { 2206sub prepare_temp {
1944 my ($self) = @_; 2207 my ($self) = @_;
1945 2208
1946 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
1948 # safety 2211 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2214}
1952 2215
2216# called after loading the header from an original map
1953sub prepare_orig { 2217sub prepare_orig {
1954 my ($self) = @_; 2218 my ($self) = @_;
1955 2219
1956 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
1981 2245
1982sub find; 2246sub find;
1983sub find { 2247sub find {
1984 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
1985 2249
2250 cf::cede_to_tick;
2251
1986 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
1987 2253
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2256
1991 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
2008 2274
2009 $cf::MAP{$path} = $map 2275 $cf::MAP{$path} = $map
2010 } 2276 }
2011} 2277}
2012 2278
2013sub pre_load { } 2279sub pre_load { }
2014sub post_load { } 2280#sub post_load { } # XS
2015 2281
2016sub load { 2282sub load {
2017 my ($self) = @_; 2283 my ($self) = @_;
2018 2284
2019 local $self->{deny_reset} = 1; # loading can take a long time 2285 local $self->{deny_reset} = 1; # loading can take a long time
2022 2288
2023 { 2289 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
2025 2291
2026 return unless $self->valid; 2292 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2294
2031 $self->alloc; 2295 $self->alloc;
2032 2296
2033 $self->pre_load; 2297 $self->pre_load;
2034 cf::cede_to_tick; 2298 cf::cede_to_tick;
2035 2299
2300 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2302 $f->skip_block;
2038 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2039 or return; 2304 or return;
2040 2305
2041 $self->post_load_original 2306 $self->post_load_original
2042 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2043 2308
2044 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2310 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2313 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2051 } 2317 }
2052 } 2318 }
2053 }
2054 2319
2055 $f->resolve_delayed_derefs; 2320 $f->resolve_delayed_derefs;
2321 } else {
2322 $self->post_load_original
2323 if delete $self->{load_original};
2324 }
2325
2326 $self->state (cf::MAP_INACTIVE);
2056 2327
2057 cf::cede_to_tick; 2328 cf::cede_to_tick;
2058 # now do the right thing for maps 2329 # now do the right thing for maps
2059 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2336 $self->decay_objects;
2066 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2067 $self->update_buttons; 2338 $self->update_buttons;
2068 cf::cede_to_tick; 2339 cf::cede_to_tick;
2069 $self->activate; 2340 #$self->activate; # no longer activate maps automatically
2070 } 2341 }
2071 2342
2072 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2345 }
2077 2346
2078 $self->post_load; 2347 $self->post_load;
2079}
2080 2348
2349 1
2350}
2351
2352# customize the map for a given player, i.e.
2353# return the _real_ map. used by e.g. per-player
2354# maps to change the path to ~playername/mappath
2081sub customise_for { 2355sub customise_for {
2082 my ($self, $ob) = @_; 2356 my ($self, $ob) = @_;
2083 2357
2084 return find "~" . $ob->name . "/" . $self->{path} 2358 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2359 if $self->per_player;
2088# if $self->per_party; 2362# if $self->per_party;
2089 2363
2090 $self 2364 $self
2091} 2365}
2092 2366
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2367sub find_sync {
2120 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2121 2369
2122 cf::sync_job { find $path, $origin } 2370 # it's a bug to call this from the main context
2371 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2372 if $Coro::current == $Coro::main;
2373
2374 find $path, $origin
2123} 2375}
2124 2376
2125sub do_load_sync { 2377sub do_load_sync {
2126 my ($map) = @_; 2378 my ($map) = @_;
2127 2379
2380 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2130 2383
2131 cf::sync_job { $map->load }; 2384 $map->load;
2132} 2385}
2133 2386
2134our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2136 2389
2137sub find_async { 2390sub find_async {
2138 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2139 2392
2140 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2141 2394
2142 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2396 return $map if !$load || $map->linkable;
2144 } 2397 }
2145 2398
2146 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2147 2400
2148 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2149 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2150 2403
2151 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2152 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2153 if (my $map = find $k) { 2406 if (my $map = find $k) {
2154 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2155 } 2408 }
2156 2409
2157 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2158 } 2411 }
2159 } 2412 }
2162 $MAP_PREFETCHER->prio (6); 2415 $MAP_PREFETCHER->prio (6);
2163 2416
2164 () 2417 ()
2165} 2418}
2166 2419
2420# common code, used by both ->save and ->swapout
2167sub save { 2421sub _save {
2168 my ($self) = @_; 2422 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2423
2172 $self->{last_save} = $cf::RUNTIME; 2424 $self->{last_save} = $cf::RUNTIME;
2173 2425
2174 return unless $self->dirty; 2426 return unless $self->dirty;
2175 2427
2195 } else { 2447 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2448 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2449 }
2198} 2450}
2199 2451
2452sub save {
2453 my ($self) = @_;
2454
2455 my $lock = cf::lock_acquire "map_data:$self->{path}";
2456
2457 $self->_save;
2458}
2459
2200sub swap_out { 2460sub swap_out {
2201 my ($self) = @_; 2461 my ($self) = @_;
2202 2462
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2464
2465 return if !$self->linkable;
2466 return if $self->{deny_save};
2208 return if $self->players; 2467 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2468
2469 # first deactivate the map and "unlink" it from the core
2470 $self->deactivate;
2471 $_->clear_links_to ($self) for values %cf::MAP;
2472 $self->state (cf::MAP_SWAPPED);
2473
2474 # then atomically save
2475 $self->_save;
2476
2477 # then free the map
2478 $self->clear;
2479}
2480
2481sub reset_at {
2482 my ($self) = @_;
2483
2484 # TODO: safety, remove and allow resettable per-player maps
2210 return if $self->{deny_save}; 2485 return 1e99 if $self->{deny_reset};
2211 2486
2487 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2488 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2489
2490 $time + $to
2491}
2492
2493sub should_reset {
2494 my ($self) = @_;
2495
2496 $self->reset_at <= $cf::RUNTIME
2497}
2498
2499sub reset {
2500 my ($self) = @_;
2501
2502 my $lock = cf::lock_acquire "map_data:$self->{path}";
2503
2504 return if $self->players;
2505
2506 cf::trace "resetting map ", $self->path, "\n";
2507
2212 $self->in_memory (cf::MAP_SWAPPED); 2508 $self->state (cf::MAP_SWAPPED);
2509
2510 # need to save uniques path
2511 unless ($self->{deny_save}) {
2512 my $uniq = $self->uniq_path; utf8::encode $uniq;
2513
2514 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2515 if $uniq;
2516 }
2517
2518 delete $cf::MAP{$self->path};
2213 2519
2214 $self->deactivate; 2520 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2521 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2522 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2523
2262 $self->unlink_save; 2524 $self->unlink_save;
2263 $self->destroy; 2525 $self->destroy;
2264} 2526}
2265 2527
2273 2535
2274 delete $cf::MAP{$self->path}; 2536 delete $cf::MAP{$self->path};
2275 2537
2276 $self->unlink_save; 2538 $self->unlink_save;
2277 2539
2278 bless $self, "cf::map"; 2540 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2541 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2542 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2543 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2544 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2545
2340 : normalise $_ 2602 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2603 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2604 ]
2343} 2605}
2344 2606
2607=item cf::map::static_maps
2608
2609Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2610file in the shared directory excluding F</styles> and F</editor>). May
2611block.
2612
2613=cut
2614
2615sub static_maps() {
2616 my @dirs = "";
2617 my @maps;
2618
2619 while (@dirs) {
2620 my $dir = shift @dirs;
2621
2622 next if $dir eq "/styles" || $dir eq "/editor";
2623
2624 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2625 or return;
2626
2627 for (@$files) {
2628 s/\.map$// or next;
2629 utf8::decode $_;
2630 push @maps, "$dir/$_";
2631 }
2632
2633 push @dirs, map "$dir/$_", @$dirs;
2634 }
2635
2636 \@maps
2637}
2638
2345=back 2639=back
2346 2640
2347=head3 cf::object 2641=head3 cf::object
2348 2642
2349=cut 2643=cut
2372 2666
2373Creates and returns a persistent reference to an object that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2374 2668
2375=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2376 2670
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2671returns the objetc referenced by refstring. may return undef when it cannot find the object,
2378even if the object actually exists. May block. 2672even if the object actually exists. May block.
2379 2673
2380=cut 2674=cut
2381 2675
2382sub deref { 2676sub deref {
2464=item $player_object->may ("access") 2758=item $player_object->may ("access")
2465 2759
2466Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2467(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2468 2762
2763This is implemented by checking a config setting of C<may_access> where
2764C<access> is replaced by the access string. The following alternatives are
2765possible (and are tested in order):
2766
2767=over 4
2768
2769=item * Player is DM
2770
2771The request will succeed.
2772
2773=item * may_access is an array reference
2774
2775If either the player nickname or UUID is in the array, the request will
2776succeed, otherwise it will fail.
2777
2778=item * may_access is a true value
2779
2780The request will succeed.
2781
2782=item * may_access is missing or false
2783
2784The request will fail.
2785
2786=back
2787
2469=cut 2788=cut
2470 2789
2471sub cf::object::player::may { 2790sub cf::object::player::may {
2472 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2473 2792
2474 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2475 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2476 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2477 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2478} 2797}
2479 2798
2480=item $player_object->enter_link 2799=item $player_object->enter_link
2481 2800
2482Freezes the player and moves him/her to a special map (C<{link}>). 2801Freezes the player and moves him/her to a special map (C<{link}>).
2483 2802
2484The player should be reasonably safe there for short amounts of time (e.g. 2803The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2804for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2805though, as the player cannot control the character while it is on the link
2487map. 2806map.
2488 2807
2489Will never block. 2808This method will never block, which is the whole reaosn for it's
2809existance: you can I<always> put a player onto the link map, which is the
2810only place to put objects that is guaranteed to exist.
2811
2812A typical usage pattern is to call C<enter_link> synchronously from the
2813server, then start a new thread, do your blocking stuff there and then
2814call C<leave_link> from that thread.
2490 2815
2491=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2492 2817
2493Moves the player out of the special C<{link}> map onto the specified 2818Moves the player out of the special C<{link}> map onto the specified
2494map. If the map is not valid (or omitted), the player will be moved back 2819map. If the map is not valid (or omitted), the player will be moved back
2512sub cf::object::player::enter_link { 2837sub cf::object::player::enter_link {
2513 my ($self) = @_; 2838 my ($self) = @_;
2514 2839
2515 $self->deactivate_recursive; 2840 $self->deactivate_recursive;
2516 2841
2842 ++$self->{_link_recursion};
2843
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2844 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2845
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2846 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2847 if $self->map && $self->map->{path} ne "{link}";
2521 2848
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2849 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2850}
2524 2851
2525sub cf::object::player::leave_link { 2852sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2853 my ($self, $map, $x, $y) = @_;
2527 2854
2544 ($x, $y) = (-1, -1) 2871 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2872 unless (defined $x) && (defined $y);
2546 2873
2547 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2550 2877
2551 $map->load; 2878 $map->load;
2552 $map->load_neighbours;
2553 2879
2554 return unless $self->contr->active; 2880 return unless $self->contr->active;
2555 2881
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2883 if ($self->enter_map ($map, $x, $y)) {
2558 2884 # entering was successful
2885 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2886 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2887 $self->activate_recursive;
2561} 2888 }
2562 2889
2890}
2891
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2892=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2893
2565Moves the player to the given map-path and coordinates by first freezing 2894Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2895her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2896that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2897the new (success) or old (failed) map position. In either case, $done will
2575 2904
2576our $GOTOGEN; 2905our $GOTOGEN;
2577 2906
2578sub cf::object::player::goto { 2907sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2908 my ($self, $path, $x, $y, $check, $done) = @_;
2909
2910 if ($self->{_link_recursion} >= $MAX_LINKS) {
2911 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2912 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2913 ($path, $x, $y) = @$EMERGENCY_POSITION;
2914 }
2580 2915
2581 # do generation counting so two concurrent goto's will be executed in-order 2916 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2917 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2918
2584 $self->enter_link; 2919 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2605 } 2940 }
2606 } 2941 }
2607 2942
2608 my $map = eval { 2943 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2945
2611 if ($map) { 2946 if ($map) {
2612 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2949 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2950 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2951 }
2617 2952
2618 $map 2953 $map
2626 if ($gen == $self->{_goto_generation}) { 2961 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2962 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2963 $self->leave_link ($map, $x, $y);
2629 } 2964 }
2630 2965
2631 $done->() if $done; 2966 $done->($self) if $done;
2632 })->prio (1); 2967 })->prio (1);
2633} 2968}
2634 2969
2635=item $player_object->enter_exit ($exit_object) 2970=item $player_object->enter_exit ($exit_object)
2636 2971
2704 $Coro::current->{desc} = "enter_exit"; 3039 $Coro::current->{desc} = "enter_exit";
2705 3040
2706 unless (eval { 3041 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 3042 $self->deactivate_recursive; # just to be sure
2708 3043
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3044 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 3045 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp; 3046 my $y = $exit->stats->sp;
3047
3048 # special map handling
3049 my $slaying = $exit->slaying;
3050
3051 # special map handling
3052 if ($slaying eq "/!") {
3053 my $guard = cf::lock_acquire "exit_prepare:$exit";
3054
3055 prepare_random_map $exit
3056 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3057
3058 $map = $exit->slaying;
3059
3060 } elsif ($slaying eq '!up') {
3061 $map = $exit->map->tile_path (cf::TILE_UP);
3062 $x = $exit->x;
3063 $y = $exit->y;
3064
3065 } elsif ($slaying eq '!down') {
3066 $map = $exit->map->tile_path (cf::TILE_DOWN);
3067 $x = $exit->x;
3068 $y = $exit->y;
3069 }
2720 3070
2721 $self->goto ($map, $x, $y); 3071 $self->goto ($map, $x, $y);
2722 3072
2723 # if exit is damned, update players death & WoR home-position 3073 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 3074 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 3079 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 3080 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 3081 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 3082 cf::NDI_UNIQUE | cf::NDI_RED);
2733 3083
2734 warn "ERROR in enter_exit: $@"; 3084 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 3085 $self->leave_link;
2736 } 3086 }
2737 })->prio (1); 3087 })->prio (1);
2738} 3088}
2739 3089
2740=head3 cf::client 3090=head3 cf::client
2741 3091
2742=over 4 3092=over 4
2743 3093
2744=item $client->send_drawinfo ($text, $flags) 3094=item $client->send_big_packet ($pkt)
2745 3095
2746Sends a drawinfo packet to the client. Circumvents output buffering so 3096Like C<send_packet>, but tries to compress large packets, and fragments
2747should not be used under normal circumstances. 3097them as required.
2748 3098
2749=cut 3099=cut
2750 3100
3101our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3102
2751sub cf::client::send_drawinfo { 3103sub cf::client::send_big_packet {
2752 my ($self, $text, $flags) = @_; 3104 my ($self, $pkt) = @_;
2753 3105
2754 utf8::encode $text; 3106 # try lzf for large packets
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3107 $pkt = "lzf " . Compress::LZF::compress $pkt
3108 if 1024 <= length $pkt and $self->{can_lzf};
3109
3110 # split very large packets
3111 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3112 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3113 $pkt = "frag";
3114 }
3115
3116 $self->send_packet ($pkt);
2756} 3117}
2757 3118
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3120
2760Send a drawinfo or msg packet to the client, formatting the msg for the 3121Send a msg packet to the client, formatting the msg for the client if
2761client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2762the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
2763the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2764 3125
2765=cut 3126=cut
2766 3127
2767# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3129our %CHANNEL = (
3130 "c/motd" => {
3131 id => "infobox",
3132 title => "MOTD",
3133 reply => undef,
3134 tooltip => "The message of the day",
3135 },
2769 "c/identify" => { 3136 "c/identify" => {
2770 id => "infobox", 3137 id => "infobox",
2771 title => "Identify", 3138 title => "Identify",
2772 reply => undef, 3139 reply => undef,
2773 tooltip => "Items recently identified", 3140 tooltip => "Items recently identified",
2775 "c/examine" => { 3142 "c/examine" => {
2776 id => "infobox", 3143 id => "infobox",
2777 title => "Examine", 3144 title => "Examine",
2778 reply => undef, 3145 reply => undef,
2779 tooltip => "Signs and other items you examined", 3146 tooltip => "Signs and other items you examined",
3147 },
3148 "c/shopinfo" => {
3149 id => "infobox",
3150 title => "Shop Info",
3151 reply => undef,
3152 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3153 },
2781 "c/book" => { 3154 "c/book" => {
2782 id => "infobox", 3155 id => "infobox",
2783 title => "Book", 3156 title => "Book",
2784 reply => undef, 3157 reply => undef,
2798 }, 3171 },
2799 "c/body" => { 3172 "c/body" => {
2800 id => "infobox", 3173 id => "infobox",
2801 title => "Body Parts", 3174 title => "Body Parts",
2802 reply => undef, 3175 reply => undef,
2803 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
2804 }, 3177 },
2805 "c/statistics" => { 3178 "c/statistics" => {
2806 id => "infobox", 3179 id => "infobox",
2807 title => "Statistics", 3180 title => "Statistics",
2808 reply => undef, 3181 reply => undef,
2860 id => "death", 3233 id => "death",
2861 title => "Death", 3234 title => "Death",
2862 reply => undef, 3235 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
2864 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
2865 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
2867); 3246);
2868 3247
2869sub cf::client::send_msg { 3248sub cf::client::send_msg {
2900 my $pkt = "msg " 3279 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3280 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3281 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3282 );
2904 3283
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3284 $self->send_big_packet ($pkt);
2916} 3285}
2917 3286
2918=item $client->ext_msg ($type, @msg) 3287=item $client->ext_msg ($type, @msg)
2919 3288
2920Sends an ext event to the client. 3289Sends an ext event to the client.
2922=cut 3291=cut
2923 3292
2924sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
2926 3295
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951} 3297}
2952 3298
2953=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
2954 3300
2955Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
2975 3321
2976 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
2977 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
2978 3324
2979 1 3325 1
3326}
3327
3328=item $client->update_command_faces
3329
3330=cut
3331
3332our %COMMAND_FACE;
3333
3334sub cf::client::update_command_faces {
3335 my ($self) = @_;
3336
3337 my @faces = grep $_,
3338 $COMMAND_FACE{preferred},
3339 $COMMAND_FACE{standard},
3340 $COMMAND_FACE{skill},
3341 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3342 $COMMAND_FACE{emote},
3343 ;
3344
3345 $self->send_face ($_)
3346 for @faces;
3347 $self->flush_fx;
3348
3349 $self->ext_msg (command_list => @faces);
3350}
3351
3352=item cf::client::set_command_face $type, $commands
3353
3354=cut
3355
3356sub cf::client::set_command_face {
3357 my ($type, $list) = @_;
3358
3359 my $idx = &cf::face::set ( #d# ugly forward reference
3360 "command_list/$type" => cf::FT_RSRC,
3361 JSON::XS->new->utf8->encode ([ sort @$list ])
3362 );
3363
3364 $COMMAND_FACE{$type} = $idx;
2980} 3365}
2981 3366
2982cf::client->attach ( 3367cf::client->attach (
2983 on_connect => sub { 3368 on_connect => sub {
2984 my ($ns) = @_; 3369 my ($ns) = @_;
3010 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
3011 3396
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013 3398
3014 if (ref $msg) { 3399 if (ref $msg) {
3015 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019 3401
3020 my @reply;
3021
3022 if (my $cb = $EXTICMD{$type}) { 3402 if (my $cb = $EXTIACMD{$type}) {
3403 $cb->(
3404 $ns,
3405 sub {
3406 $ns->ext_msg ("reply-$reply", @_)
3407 if $reply;
3408 },
3409 @payload
3410 );
3411 } else {
3412 my @reply;
3413
3414 if (my $cb = $EXTICMD{$type}) {
3023 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3024 } 3420 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
3029 } else { 3421 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3422 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3423 }
3032 3424
3033 cf::override; 3425 cf::override;
3034 }, 3426 },
3035); 3427);
3055 3447
3056 $coro 3448 $coro
3057} 3449}
3058 3450
3059cf::client->attach ( 3451cf::client->attach (
3060 on_destroy => sub { 3452 on_client_destroy => sub {
3061 my ($ns) = @_; 3453 my ($ns) = @_;
3062 3454
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3455 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3456 },
3065); 3457);
3081our $safe_hole = new Safe::Hole; 3473our $safe_hole = new Safe::Hole;
3082 3474
3083$SIG{FPE} = 'IGNORE'; 3475$SIG{FPE} = 'IGNORE';
3084 3476
3085$safe->permit_only (Opcode::opset qw( 3477$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3478 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3479 grepstart grepwhile mapstart mapwhile
3088 sort time 3480 sort time
3089)); 3481));
3090 3482
3091# here we export the classes and methods available to script code 3483# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3510 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3120) { 3512) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3515 for @funs;
3125} 3516}
3126 3517
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3534 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3535 $qcode =~ s/\n/\\n/g;
3145 3536
3146 %vars = (_dummy => 0) unless %vars; 3537 %vars = (_dummy => 0) unless %vars;
3147 3538
3539 my @res;
3148 local $_; 3540 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3541
3151 my $eval = 3542 my $eval =
3152 "do {\n" 3543 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3544 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3545 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3546 . $code
3156 . "\n}" 3547 . "\n}"
3157 ; 3548 ;
3158 3549
3550 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3551 sub_generation_inc;
3552 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3553 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3554 sub_generation_inc;
3555 } else {
3556 local @cf::_safe_eval_args = values %vars;
3557 @res = wantarray ? eval eval : scalar eval $eval;
3558 }
3162 3559
3163 if ($@) { 3560 if ($@) {
3164 warn "$@"; 3561 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3562 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3563 "with arguments " . (join " ", %vars) . "\n";
3167 } 3564 }
3168 3565
3169 wantarray ? @res : $res[0] 3566 wantarray ? @res : $res[0]
3170} 3567}
3171 3568
3185=cut 3582=cut
3186 3583
3187sub register_script_function { 3584sub register_script_function {
3188 my ($fun, $cb) = @_; 3585 my ($fun, $cb) = @_;
3189 3586
3190 no strict 'refs'; 3587 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3588 *$fun = $safe_hole->wrap ($cb);
3192} 3589}
3193 3590
3194=back 3591=back
3195 3592
3196=cut 3593=cut
3197 3594
3198############################################################################# 3595#############################################################################
3199# the server's init and main functions 3596# the server's init and main functions
3200 3597
3598{
3599 package cf::face;
3600
3601 our %HASH; # hash => idx
3602 our @DATA; # dynamically-created facedata, only faceste 0 used
3603 our @FOFS; # file offset, if > 0
3604 our @SIZE; # size of face, in octets
3605 our @META; # meta hash of face, if any
3606 our $DATAFH; # facedata filehandle
3607
3608 # internal api, not finalised
3609 sub set {
3610 my ($name, $type, $data) = @_;
3611
3612 my $idx = cf::face::find $name;
3613
3614 if ($idx) {
3615 delete $HASH{cf::face::get_csum $idx};
3616 } else {
3617 $idx = cf::face::alloc $name;
3618 }
3619
3620 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3621
3622 cf::face::set_type $idx, $type;
3623 cf::face::set_csum $idx, 0, $hash;
3624
3625 # we need to destroy the SV itself, not just modify it, as a running ix
3626 # might hold a reference to it: "delete" achieves that.
3627 delete $FOFS[0][$idx];
3628 delete $DATA[0][$idx];
3629 $DATA[0][$idx] = $data;
3630 $SIZE[0][$idx] = length $data;
3631 delete $META[$idx];
3632 $HASH{$hash} = $idx;#d#
3633
3634 $idx
3635 }
3636
3637 sub _get_data($$$) {
3638 my ($idx, $set, $cb) = @_;
3639
3640 if (defined $DATA[$set][$idx]) {
3641 $cb->($DATA[$set][$idx]);
3642 } elsif (my $fofs = $FOFS[$set][$idx]) {
3643 my $size = $SIZE[$set][$idx];
3644 my $buf;
3645 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3646 if ($_[0] == $size) {
3647 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3648 $cb->($buf);
3649 } else {
3650 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3651 }
3652 };
3653 } else {
3654 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3655 }
3656 }
3657
3658 # rather ineffient
3659 sub cf::face::get_data($;$) {
3660 my ($idx, $set) = @_;
3661
3662 _get_data $idx, $set, Coro::rouse_cb;
3663 Coro::rouse_wait
3664 }
3665
3666 sub cf::face::ix {
3667 my ($ns, $set, $idx, $pri) = @_;
3668
3669 _get_data $idx, $set, sub {
3670 $ns->ix_send ($idx, $pri, $_[0]);
3671 };
3672 }
3673}
3674
3201sub load_facedata($) { 3675sub load_facedata($) {
3202 my ($path) = @_; 3676 my ($path) = @_;
3203 3677
3204 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = ();
3207
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3679
3210 warn "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3211 3681
3212 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3683
3218 $facedata->{version} == 2 3684 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3220 3686
3221 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3222 $facedata->{resource}{"res/exp_table"} = { 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3223 type => FT_RSRC, 3689
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3690 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3225 }; 3691
3226 cf::cede_to_tick; 3692 # BEGIN ATOMIC
3693 # from here on, everything must be atomic - no thread switch allowed
3694 my $t1 = EV::time;
3227 3695
3228 { 3696 {
3229 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3230 3698
3231 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3702
3234 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3705 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3706 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3238 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3239 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3240 } 3710 }
3241 3711
3242 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3243 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3244 3714
3247 3717
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3718 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3721 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3723 }
3254
3255 cf::cede_to_tick;
3256 } 3724 }
3257 } 3725 }
3258 3726
3259 { 3727 {
3260 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3261 3729
3262 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3263 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3264 cf::cede_to_tick;
3265 } 3732 }
3266 3733
3267 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3268 } 3735 }
3269 3736
3270 { 3737 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3274 3739
3275 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3741 if (defined (my $type = $info->{type})) {
3742 # TODO: different hash - must free and use new index, or cache ixface data queue
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3744
3280 if ($info->{type} & 1) {
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3745 cf::face::set_type $idx, $type;
3746 cf::face::set_csum $idx, 0, $info->{hash};
3747 $cf::face::SIZE[0][$idx] = $info->{size};
3748 $cf::face::FOFS[0][$idx] = $info->{fofs};
3749 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3750 $cf::face::HASH{$info->{hash}} = $idx;
3295 } else { 3751 } else {
3296 $RESOURCE{$name} = $info; 3752# $RESOURCE{$name} = $info; # unused
3297 } 3753 }
3298
3299 cf::cede_to_tick;
3300 } 3754 }
3301 } 3755 }
3756
3757 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3758
3759 # HACK to clear player env face cache, we need some signal framework
3760 # for this (global event?)
3761 %ext::player_env::MUSIC_FACE_CACHE = ();
3762
3763 # END ATOMIC
3764
3765 cf::debug "facedata atomic update time ", EV::time - $t1;
3302 3766
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3768
3769 aio_close $fh if $fh; # close old facedata
3770
3305 1 3771 1
3306} 3772}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3773
3328register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3775 my ($ns, $want) = @_;
3330 3776
3331 while (my ($k, $v) = each %$want) { 3777 while (my ($k, $v) = each %$want) {
3339 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3341 cf::arch::commit_load; 3787 cf::arch::commit_load;
3342 3788
3343 $status 3789 $status
3790}
3791
3792sub reload_exp_table {
3793 _reload_exp_table;
3794
3795 cf::face::set
3796 "res/exp_table" => FT_RSRC,
3797 JSON::XS->new->utf8->canonical->encode (
3798 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3799 );
3800}
3801
3802sub reload_materials {
3803 _reload_materials;
3344} 3804}
3345 3805
3346sub reload_regions { 3806sub reload_regions {
3347 # HACK to clear player env face cache, we need some signal framework 3807 # HACK to clear player env face cache, we need some signal framework
3348 # for this (global event?) 3808 # for this (global event?)
3356 if exists $_->{match}; 3816 if exists $_->{match};
3357 } 3817 }
3358} 3818}
3359 3819
3360sub reload_facedata { 3820sub reload_facedata {
3361 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3362 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3363} 3823}
3364 3824
3365sub reload_archetypes { 3825sub reload_archetypes {
3366 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3367 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3828
3829 cf::face::set
3830 "res/skill_info" => FT_RSRC,
3831 JSON::XS->new->utf8->canonical->encode (
3832 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3833 );
3834
3835 cf::face::set
3836 "res/spell_paths" => FT_RSRC,
3837 JSON::XS->new->utf8->canonical->encode (
3838 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3839 );
3840
3841 # command completion
3842 my @commands;
3843
3844 for (0..cf::arch::skillvec_size - 1) {
3845 my $skill = cf::arch::skillvec $_;
3846 my $name = $skill->name;
3847 my $flags = cf::skill_flags $skill->subtype;
3848
3849 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3850 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3851 }
3852
3853 cf::client::set_command_face skill => \@commands;
3368} 3854}
3369 3855
3370sub reload_treasures { 3856sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3373} 3859}
3374 3860
3861sub reload_sound {
3862 trace "loading sound config from $DATADIR/sound\n";
3863
3864 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3865
3866 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3867 my $sound = $soundconf->{compat}[$_]
3868 or next;
3869
3870 my $face = cf::face::find "sound/$sound->[1]";
3871 cf::sound::set $sound->[0] => $face;
3872 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3873 }
3874
3875 while (my ($k, $v) = each %{$soundconf->{event}}) {
3876 my $face = cf::face::find "sound/$v";
3877 cf::sound::set $k => $face;
3878 }
3879}
3880
3375sub reload_resources { 3881sub reload_resources {
3376 warn "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3377 3883
3884 reload_materials;
3378 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3887 reload_sound;
3379 reload_archetypes; 3888 reload_archetypes;
3380 reload_regions; 3889 reload_regions;
3381 reload_treasures; 3890 reload_treasures;
3382 3891
3383 warn "finished reloading resource files\n"; 3892 trace "finished reloading resource files\n";
3384} 3893}
3385 3894
3386sub reload_config { 3895sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3896 trace "reloading config file...\n";
3388 or return;
3389 3897
3390 local $/; 3898 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3899 utf8::decode $config;
3900 *CFG = decode_yaml $config;
3392 3901
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3903
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3904 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3905 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3906
3398 if (exists $CFG{mlockall}) { 3907 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3423 print $fh $$; 3932 print $fh $$;
3424} 3933}
3425 3934
3426sub main_loop { 3935sub main_loop {
3427 warn "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3428 if (1) { 3937 if (1) {
3429 EV::loop; 3938 EV::run;
3430 } 3939 }
3431 warn "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3433} 3942}
3434 3943
3435sub main { 3944sub main {
3436 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3437 3946
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3947 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3948 LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3949 LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442 3952
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3953 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3954
3450 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3957 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3958 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3456 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3457 }; 3962 };
3458 3963
3459 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3460 3965
3461 cf::sync_job { 3966 cf::sync_job {
3967 cf::incloader::init ();
3968
3969 db_init;
3970
3971 cf::init_anim;
3972 cf::init_attackmess;
3973 cf::init_dynamic;
3974
3975 cf::load_settings;
3976
3462 reload_resources; 3977 reload_resources;
3463 reload_config; 3978 reload_config;
3464 db_init;
3465 3979
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3980 cf::init_uuid;
3469 cf::init_signals; 3981 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3982 cf::init_skills;
3472 3983
3473 cf::init_beforeplay; 3984 cf::init_beforeplay;
3474 3985
3475 atomic; 3986 atomic;
3480 3991
3481 # no (long-running) fork's whatsoever before this point(!) 3992 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3993 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3994 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3995
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3996 cf::_post_init 0;
3486 }; 3997 };
3487 3998
3999 cf::object::thawer::errors_are_fatal 0;
4000 info "parse errors in files are no longer fatal from this point on.\n";
4001
4002 AE::postpone {
4003 undef &main; # free gobs of memory :)
4004 };
4005
3488 main_loop; 4006 goto &main_loop;
3489} 4007}
3490 4008
3491############################################################################# 4009#############################################################################
3492# initialisation and cleanup 4010# initialisation and cleanup
3493 4011
3494# install some emergency cleanup handlers 4012# install some emergency cleanup handlers
3495BEGIN { 4013BEGIN {
3496 our %SIGWATCHER = (); 4014 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 4015 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4016 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 4017 cf::cleanup "SIG$signal";
3500 }; 4018 };
3501 } 4019 }
3502} 4020}
3503 4021
3504sub write_runtime_sync { 4022sub write_runtime_sync {
4023 my $t0 = AE::time;
4024
3505 # first touch the runtime file to show we are still running: 4025 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 4026 # the fsync below can take a very very long time.
3507 4027
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4028 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 4029
3510 my $guard = cf::lock_acquire "write_runtime"; 4030 my $guard = cf::lock_acquire "write_runtime";
3511 4031
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4032 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 4033 or return;
3514 4034
3515 my $value = $cf::RUNTIME + 90 + 10; 4035 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 4036 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 4037 # 60 allows for the watchdog to kill the server.
3530 or return; 4050 or return;
3531 4051
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4052 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 4053 and return;
3534 4054
3535 warn "runtime file written.\n"; 4055 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 4056
3537 1 4057 1
3538} 4058}
3539 4059
3540our $uuid_lock; 4060our $uuid_lock;
3552 or return; 4072 or return;
3553 4073
3554 my $value = uuid_seq uuid_cur; 4074 my $value = uuid_seq uuid_cur;
3555 4075
3556 unless ($value) { 4076 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 4077 info "cowardly refusing to write zero uuid value!\n";
3558 return; 4078 return;
3559 } 4079 }
3560 4080
3561 my $value = uuid_str $value + $uuid_skip; 4081 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 4082 $uuid_skip = 0;
3572 or return; 4092 or return;
3573 4093
3574 aio_rename "$uuid~", $uuid 4094 aio_rename "$uuid~", $uuid
3575 and return; 4095 and return;
3576 4096
3577 warn "uuid file written ($value).\n"; 4097 trace "uuid file written ($value).\n";
3578 4098
3579 1 4099 1
3580 4100
3581} 4101}
3582 4102
3588} 4108}
3589 4109
3590sub emergency_save() { 4110sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3592 4112
3593 warn "emergency_perl_save: enter\n"; 4113 info "emergency_perl_save: enter\n";
4114
4115 # this is a trade-off: we want to be very quick here, so
4116 # save all maps without fsync, and later call a global sync
4117 # (which in turn might be very very slow)
4118 local $USE_FSYNC = 0;
3594 4119
3595 cf::sync_job { 4120 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 4121 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 4122
3601 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 4127 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 4128 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 4129 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 4131 $pl->save;
3610 } 4132 }
3611 warn "emergency_perl_save: end player save\n"; 4133 info "emergency_perl_save: end player save\n";
3612 4134
4135 cf::write_runtime_sync; # external watchdog should not bark
4136
3613 warn "emergency_perl_save: begin map save\n"; 4137 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 4140 $map->valid or next;
3617 $map->save; 4141 $map->save;
3618 } 4142 }
3619 warn "emergency_perl_save: end map save\n"; 4143 info "emergency_perl_save: end map save\n";
3620 4144
4145 cf::write_runtime_sync; # external watchdog should not bark
4146
3621 warn "emergency_perl_save: begin database checkpoint\n"; 4147 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
3624 4150
3625 warn "emergency_perl_save: begin write uuid\n"; 4151 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 4152 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 4153 info "emergency_perl_save: end write uuid\n";
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
4156
4157 trace "emergency_perl_save: syncing database to disk";
4158 BDB::db_env_txn_checkpoint $DB_ENV;
4159
4160 info "emergency_perl_save: starting sync\n";
4161 IO::AIO::aio_sync sub {
4162 info "emergency_perl_save: finished sync\n";
4163 };
4164
4165 cf::write_runtime_sync; # external watchdog should not bark
4166
4167 trace "emergency_perl_save: flushing outstanding aio requests";
4168 while (IO::AIO::nreqs || BDB::nreqs) {
4169 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4170 }
4171
4172 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 4173 };
3629 4174
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 4175 info "emergency_perl_save: leave\n";
3636} 4176}
3637 4177
3638sub post_cleanup { 4178sub post_cleanup {
3639 my ($make_core) = @_; 4179 my ($make_core) = @_;
3640 4180
4181 IO::AIO::flush;
4182
3641 warn Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 4184 if $make_core;
3643 4185
3644 my $fh = pidfile; 4186 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 4187 unlink $PIDFILE if <$fh> == $$;
3646} 4188}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4208 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 4209 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 4210 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4211# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 4212 }
3671 warn "cleared package $pkg\n";#d#
3672} 4213}
3673 4214
3674sub do_reload_perl() { 4215sub do_reload_perl() {
3675 # can/must only be called in main 4216 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 4217 unless (in_main) {
3677 warn "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3678 return; 4219 return;
3679 } 4220 }
3680 4221
3681 return if $RELOAD++; 4222 return if $RELOAD++;
3682 4223
3683 my $t1 = EV::time; 4224 my $t1 = AE::time;
3684 4225
3685 while ($RELOAD) { 4226 while ($RELOAD) {
3686 warn "reloading..."; 4227 cf::get_slot 0.1, -1, "reload_perl";
4228 info "perl_reload: reloading...";
3687 4229
3688 warn "entering sync_job"; 4230 trace "perl_reload: entering sync_job";
3689 4231
3690 cf::sync_job { 4232 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 4233 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 4234
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 4237 %EXT_CORO = ();
3708 4238
3709 warn "removing commands"; 4239 trace "perl_reload: removing commands";
3710 %COMMAND = (); 4240 %COMMAND = ();
3711 4241
3712 warn "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 4243 %EXTCMD = ();
3714 %EXTICMD = (); 4244 %EXTICMD = ();
3715 4245
3716 warn "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 4248 trace "... unloading $pkg";
3719 4249
3720 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3721 eval { 4251 eval {
3722 $cb->($pkg); 4252 $cb->($pkg);
3723 1 4253 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 4254 } or error "$pkg unloaded, but with errors: $@";
3725 } 4255 }
3726 4256
3727 warn "... clearing $pkg"; 4257 trace "... clearing $pkg";
3728 clear_package $pkg; 4258 clear_package $pkg;
3729 } 4259 }
3730 4260
3731 warn "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 4264
3735 warn "... unloading $k"; 4265 trace "... unloading $k";
3736 delete $INC{$k}; 4266 delete $INC{$k};
3737 4267
3738 $k =~ s/\.pm$//; 4268 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4269 $k =~ s/\//::/g;
3740 4270
3743 } 4273 }
3744 4274
3745 clear_package $k; 4275 clear_package $k;
3746 } 4276 }
3747 4277
3748 warn "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4279 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4280 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4281
3752 warn "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4285
3756 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4287 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3759 4289
3760 warn "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3761 4291
3762 warn "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3763 require cf; 4293 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4294 cf::_connect_to_perl_1;
3765 4295
3766 warn "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4297 cf::reload_config;
3768 4298
3769 warn "loading extensions"; 4299 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4300 cf::load_extensions;
3771 4301
3772 if ($REATTACH_ON_RELOAD) { 4302 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
3779 } 4309 }
3780 4310
3781 warn "running post_init jobs"; 4311 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4312
3784 warn "leaving sync_job"; 4313 trace "perl_reload: leaving sync_job";
3785 4314
3786 1 4315 1
3787 } or do { 4316 } or do {
3788 warn $@; 4317 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4319 };
3791 4320
3792 warn "reloaded";
3793 --$RELOAD; 4321 --$RELOAD;
3794 } 4322 }
3795 4323
3796 $t1 = EV::time - $t1; 4324 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4325 info "perl_reload: completed in ${t1}s\n";
3798}; 4326};
3799 4327
3800our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3801 4329
3802sub reload_perl() { 4330sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4332 # coro crashes during coro_state_free->destroy here.
3805 4333
3806 $RELOAD_WATCHER ||= cf::async { 4334 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4335 Coro::AIO::aio_wait cache_extensions;
3808 4336
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4337 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4338 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4339 undef $RELOAD_WATCHER;
3812 }; 4340 };
3813 }; 4341 };
3814} 4342}
3823 reload_perl; 4351 reload_perl;
3824 }; 4352 };
3825 } 4353 }
3826}; 4354};
3827 4355
3828unshift @INC, $LIBDIR; 4356#############################################################################
3829 4357
3830my $bug_warning = 0; 4358my $bug_warning = 0;
3831 4359
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4360sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4362
3838 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4364}
3842 4365
3843sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4368
3846 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4371 $signal->wait;
3849} 4372}
3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4376 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
3855 return; 4378 return;
3856 } 4379 }
3857 4380
3858 cf::server_tick; # one server iteration 4381 cf::one_tick; # one server iteration
4382
4383 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4384
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4386 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4387 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4388 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4389 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4390 or error "ERROR: unable to write runtime file: $!";
3866 }; 4391 };
3867 } 4392 }
3868 4393
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4395 $sig->send;
3871 } 4396 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4398
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4401
3879 if (0) { 4402 if (0) {
3880 if ($NEXT_TICK) { 4403 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4404 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4405 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4406 debug "jitter $JITTER\n";#d#
3884 } 4407 }
3885 } 4408 }
3886} 4409}
3887 4410
3888{ 4411{
3889 # configure BDB 4412 # configure BDB
4413 info "initialising database";
3890 4414
3891 BDB::min_parallel 8; 4415 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
3894 4418
3895 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4422 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3923 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3924 }; 4448 };
3925 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3927 }; 4451 };
4452
4453 info "database initialised";
3928} 4454}
3929 4455
3930{ 4456{
3931 # configure IO::AIO 4457 # configure IO::AIO
3932 4458
4459 info "initialising aio";
3933 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
3936} 4464}
3937 4465
3938my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
3939 4468
3940sub _log_backtrace { 4469sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
3942 4471
3943 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
3944 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4480 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4481 my $perl_bt = Carp::longmess $msg;
3949 async { 4482 async {
3950 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
3951 4484
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4505 --$_log_backtrace;
3973 }; 4506 };
3974 } else { 4507 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4510 }
3978} 4511}
3979 4512
3980# load additional modules 4513# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4514require "cf/$_.pm" for @EXTRA_MODULES;
4515cf::_connect_to_perl_2;
3982 4516
3983END { cf::emergency_save } 4517END { cf::emergency_save }
3984 4518
39851 45191
3986 4520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines