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.479 by root, Thu Oct 8 05:04:27 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
199# this is decidedly evil
200$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
201
174############################################################################# 202#############################################################################
175 203
176=head2 GLOBAL VARIABLES 204=head2 GLOBAL VARIABLES
177 205
178=over 4 206=over 4
179 207
180=item $cf::UPTIME 208=item $cf::UPTIME
181 209
182The 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.
183 226
184=item $cf::RUNTIME 227=item $cf::RUNTIME
185 228
186The 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
187every server tick. 230every server tick.
188 231
189=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
190$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
191$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
192 235
193Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
194directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
195unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
196database environment. 239database environment.
197 240
198=item $cf::NOW
199
200The time of the last (current) server tick.
201
202=item $cf::TICK
203
204The interval between server ticks, in seconds.
205
206=item $cf::LOADAVG 241=item $cf::LOADAVG
207 242
208The 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
209(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
210objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
218Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
219from wherever your confdir points to. 254from wherever your confdir points to.
220 255
221=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
222 257
223These 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.
224returns 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
225per 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();
226 279
227=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
228 281
229This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
230C<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
231that call. 284that call.
232 285
233=item %cf::REFLECT 286=item %cf::REFLECT
234 287
235Contains, for each (C++) class name, a hash reference with information 288Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 289about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 290metadata, which is useful for introspection.
238 291
239=back 292=back
240 293
241=cut 294=cut
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 "", @_ }
242 301
243$Coro::State::WARNHOOK = sub { 302$Coro::State::WARNHOOK = sub {
244 my $msg = join "", @_; 303 my $msg = join "", @_;
245 304
246 $msg .= "\n" 305 $msg .= "\n"
247 unless $msg =~ /\n$/; 306 unless $msg =~ /\n$/;
248 307
249 $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;
250 309
251 LOG llevError, $msg; 310 LOG llevWarn, $msg;
252}; 311};
253 312
254$Coro::State::DIEHOOK = sub { 313$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 314 return unless $^S eq 0; # "eq", not "=="
256 315
257 warn Carp::longmess $_[0]; 316 error Carp::longmess $_[0];
258 317
259 if ($Coro::current == $Coro::main) {#d# 318 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 319 error "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 320 return;#d#
262 }#d# 321 }#d#
263 322
264 # kill coroutine otherwise 323 # kill coroutine otherwise
265 Coro::terminate 324 Coro::terminate
285)) { 344)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 346}
288 347
289$EV::DIED = sub { 348$EV::DIED = sub {
290 warn "error in event callback: @_"; 349 warn "error in event callback: $@";
291}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
292 356
293############################################################################# 357#############################################################################
294 358
295=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
296 360
317 $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;
318 $d 382 $d
319 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
320} 384}
321 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
322=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
323 439
324Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
325 441
326=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
332our $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
333 449
334sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
335sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
336 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
337=item cf::post_init { BLOCK } 498=item cf::post_init { BLOCK }
338 499
339Execute the given codeblock, I<after> all extensions have been (re-)loaded, 500Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again. 501but I<before> the server starts ticking again.
341 502
342The cdoeblock will have a single boolean argument to indicate whether this 503The codeblock will have a single boolean argument to indicate whether this
343is a reload or not. 504is a reload or not.
344 505
345=cut 506=cut
346 507
347sub post_init(&) { 508sub post_init(&) {
348 push @POST_INIT, shift; 509 push @POST_INIT, shift;
349} 510}
350 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
351=item cf::lock_wait $string 529=item cf::lock_wait $string
352 530
353Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
354 532
355=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
356 534
357Wait 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
358a 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,
392} 570}
393 571
394=item cf::periodic $interval, $cb 572=item cf::periodic $interval, $cb
395 573
396Like 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
397get spread over timer. 575get spread over time.
398 576
399=cut 577=cut
400 578
401sub periodic($$) { 579sub periodic($$) {
402 my ($interval, $cb) = @_; 580 my ($interval, $cb) = @_;
406 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
407} 585}
408 586
409=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
410 588
411Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
412This 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
413of 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.
414 596
415The 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
416used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
417 599
418Useful for short background jobs. 600Useful for short background jobs.
419 601
420=cut 602=cut
421 603
422our @SLOT_QUEUE; 604our @SLOT_QUEUE;
423our $SLOT_QUEUE; 605our $SLOT_QUEUE;
606our $SLOT_DECAY = 0.9;
424 607
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 608$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 609$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 610 $Coro::current->desc ("timeslot manager");
428 611
429 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
613 my $busy;
430 614
431 while () { 615 while () {
432 next_job: 616 next_job:
617
618 Coro::cede;
619
433 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 621
435 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
624 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 626 $job->[2]->send;
439 Coro::cede;
440 goto next_job; 627 goto next_job;
441 } 628 } else {
629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 630 }
443 } 631 }
444 632
445 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
446 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
447 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait;
449 } else { 635 } else {
636 $busy = 0;
450 Coro::schedule; 637 Coro::schedule;
451 } 638 }
452 } 639 }
453}; 640};
454 641
455sub get_slot($;$$) { 642sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 643 return if tick_inhibit || $Coro::current == $Coro::main;
457 644
458 my ($time, $pri, $name) = @_; 645 my ($time, $pri, $name) = @_;
459 646
460 $time = $TICK * .6 if $time > $TICK * .6; 647 $time = clamp $time, 0.01, $TICK * .6;
648
461 my $sig = new Coro::Signal; 649 my $sig = new Coro::Signal;
462 650
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 651 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 652 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 653 $SLOT_QUEUE->ready;
477BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
478 666
479=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
480 668
481The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
482is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
483partly 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
484acceptable. 672acceptable.
485 673
486If 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
487the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
491=cut 679=cut
492 680
493sub sync_job(&) { 681sub sync_job(&) {
494 my ($job) = @_; 682 my ($job) = @_;
495 683
496 if ($Coro::current == $Coro::main) { 684 if (in_main) {
497 my $time = EV::time; 685 my $time = AE::time;
498 686
499 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
501 689
502 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
503 691
504 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
505 693
506 my $busy = 1; 694 my $busy = 1;
507 my @res; 695 my @res;
508 696
509 (async { 697 (async {
510 $Coro::current->desc ("sync job coro"); 698 $Coro::current->desc ("sync job coro");
511 @res = eval { $job->() }; 699 @res = eval { $job->() };
512 warn $@ if $@; 700 error $@ if $@;
513 undef $busy; 701 undef $busy;
514 })->prio (Coro::PRIO_MAX); 702 })->prio (Coro::PRIO_MAX);
515 703
516 while ($busy) { 704 while ($busy) {
517 if (Coro::nready) { 705 if (Coro::nready) {
518 Coro::cede_notself; 706 Coro::cede_notself;
519 } else { 707 } else {
520 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
521 } 709 }
522 } 710 }
523 711
524 my $time = EV::time - $time; 712 my $time = AE::time - $time;
525 713
526 $TICK_START += $time; # do not account sync jobs to server load 714 $TICK_START += $time; # do not account sync jobs to server load
527 715
528 wantarray ? @res : $res[0] 716 wantarray ? @res : $res[0]
529 } else { 717 } else {
551 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
552 740
553 $coro 741 $coro
554} 742}
555 743
556=item fork_call { }, $args 744=item fork_call { }, @args
557 745
558Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
559process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
560Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
561never block itself or use any form of event handling. 749never block itself or use any form of event handling.
562 750
563=cut 751=cut
564 752
753sub post_fork {
754 reset_signals;
755}
756
565sub fork_call(&@) { 757sub fork_call(&@) {
566 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
567 759
568 # we seemingly have to make a local copy of the whole thing,
569 # otherwise perl prematurely frees the stuff :/
570 # TODO: investigate and fix (likely this will be rather laborious)
571
572 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
573 reset_signals; 761 cf::post_fork;
574 &$cb 762 &$cb
575 }, @args; 763 } @args;
576 764
577 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 )
578} 777}
579 778
580=item $coin = coin_from_name $name 779=item $coin = coin_from_name $name
581 780
582=cut 781=cut
619within each server. 818within each server.
620 819
621=cut 820=cut
622 821
623sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
624 my ($name) = @_; 826 my ($name) = @_;
625 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
626 828
627 eval { 829 eval {
628 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
638} 840}
639 841
640our $DB; 842our $DB;
641 843
642sub db_init { 844sub db_init {
643 cf::sync_job {
644 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
645 };
646} 846}
647 847
648sub db_get($$) { 848sub db_get($$) {
649 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
650 850
651 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
652 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
653 855
654 $! ? () 856 $! ? ()
655 : $data 857 : $data
656 }
657} 858}
658 859
659sub db_put($$$) { 860sub db_put($$$) {
660 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
661 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
689 890
690 my @data; 891 my @data;
691 my $md5; 892 my $md5;
692 893
693 for (0 .. $#$src) { 894 for (0 .. $#$src) {
694 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
695 or Carp::croak "$src->[$_]: $!";
696 } 896 }
697 897
698 # if processing is expensive, check 898 # if processing is expensive, check
699 # checksum first 899 # checksum first
700 if (1) { 900 if (1) {
713 913
714 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
715 } 915 }
716 } 916 }
717 917
718 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
719 my $data = $process->(\@data); 919 my $data = $process->(\@data);
720 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
721 921
722 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
723 923
724 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
725 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
726 db_put cache => "$id/meta", $meta; 926 db_put cache => "$id/meta", $meta;
727 927
737 937
738=cut 938=cut
739 939
740sub datalog($@) { 940sub datalog($@) {
741 my ($type, %kv) = @_; 941 my ($type, %kv) = @_;
742 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 942 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
743} 943}
744 944
745=back 945=back
746 946
747=cut 947=cut
942 1142
943 } elsif (exists $cb_id{$type}) { 1143 } elsif (exists $cb_id{$type}) {
944 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1144 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
945 1145
946 } elsif (ref $type) { 1146 } elsif (ref $type) {
947 warn "attaching objects not supported, ignoring.\n"; 1147 error "attaching objects not supported, ignoring.\n";
948 1148
949 } else { 1149 } else {
950 shift @arg; 1150 shift @arg;
951 warn "attach argument '$type' not supported, ignoring.\n"; 1151 error "attach argument '$type' not supported, ignoring.\n";
952 } 1152 }
953 } 1153 }
954} 1154}
955 1155
956sub _object_attach { 1156sub _object_attach {
966 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
967 } 1167 }
968 1168
969 $obj->{$name} = \%arg; 1169 $obj->{$name} = \%arg;
970 } else { 1170 } else {
971 warn "object uses attachment '$name' which is not available, postponing.\n"; 1171 info "object uses attachment '$name' which is not available, postponing.\n";
972 } 1172 }
973 1173
974 $obj->{_attachment}{$name} = undef; 1174 $obj->{_attachment}{$name} = undef;
975} 1175}
976 1176
1035 1235
1036 for (@$callbacks) { 1236 for (@$callbacks) {
1037 eval { &{$_->[1]} }; 1237 eval { &{$_->[1]} };
1038 1238
1039 if ($@) { 1239 if ($@) {
1040 warn "$@";
1041 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1240 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1042 override; 1241 override;
1043 } 1242 }
1044 1243
1045 return 1 if $override; 1244 return 1 if $override;
1046 } 1245 }
1125 for (@$attach) { 1324 for (@$attach) {
1126 my ($klass, @attach) = @$_; 1325 my ($klass, @attach) = @$_;
1127 _attach $registry, $klass, @attach; 1326 _attach $registry, $klass, @attach;
1128 } 1327 }
1129 } else { 1328 } else {
1130 warn "object uses attachment '$name' that is not available, postponing.\n"; 1329 info "object uses attachment '$name' that is not available, postponing.\n";
1131 } 1330 }
1132 } 1331 }
1133} 1332}
1134 1333
1135cf::attachable->attach ( 1334cf::attachable->attach (
1162 my ($filename, $rdata, $objs) = @_; 1361 my ($filename, $rdata, $objs) = @_;
1163 1362
1164 sync_job { 1363 sync_job {
1165 if (length $$rdata) { 1364 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename); 1365 utf8::decode (my $decname = $filename);
1167 warn sprintf "saving %s (%d,%d)\n", 1366 trace sprintf "saving %s (%d,%d)\n",
1168 $decname, length $$rdata, scalar @$objs; 1367 $decname, length $$rdata, scalar @$objs
1368 if $VERBOSE_IO;
1169 1369
1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1370 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1171 aio_chmod $fh, SAVE_MODE; 1371 aio_chmod $fh, SAVE_MODE;
1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1372 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1173 if ($cf::USE_FSYNC) { 1373 if ($cf::USE_FSYNC) {
1195 aio_rename "$filename~", $filename; 1395 aio_rename "$filename~", $filename;
1196 1396
1197 $filename =~ s%/[^/]+$%%; 1397 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC; 1398 aio_pathsync $filename if $cf::USE_FSYNC;
1199 } else { 1399 } else {
1200 warn "unable to save objects: $filename~: $!\n"; 1400 error "unable to save objects: $filename~: $!\n";
1201 } 1401 }
1202 } else { 1402 } else {
1203 aio_unlink $filename; 1403 aio_unlink $filename;
1204 aio_unlink "$filename.pst"; 1404 aio_unlink "$filename.pst";
1205 } 1405 }
1229 my $st = eval { Coro::Storable::thaw $av }; 1429 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs}; 1430 $av = $st->{objs};
1231 } 1431 }
1232 1432
1233 utf8::decode (my $decname = $filename); 1433 utf8::decode (my $decname = $filename);
1234 warn sprintf "loading %s (%d,%d)\n", 1434 trace sprintf "loading %s (%d,%d)\n",
1235 $decname, length $data, scalar @{$av || []}; 1435 $decname, length $data, scalar @{$av || []}
1436 if $VERBOSE_IO;
1236 1437
1237 ($data, $av) 1438 ($data, $av)
1238} 1439}
1239 1440
1240=head2 COMMAND CALLBACKS 1441=head2 COMMAND CALLBACKS
1244=cut 1445=cut
1245 1446
1246############################################################################# 1447#############################################################################
1247# command handling &c 1448# command handling &c
1248 1449
1249=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1250 1451
1251Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1252$name. 1453$name.
1253 1454
1254=cut 1455=cut
1260 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1261 1462
1262 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1263} 1464}
1264 1465
1265=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1266 1467
1267Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1268extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1269received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1270the 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
1271has logged in successfully. 1472has logged in successfully.
1272 1473
1273If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1274called.
1275 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
1276=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1277 1482
1278Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1279exticmd 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
1280are 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
1281is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1282log-in. 1487log-in.
1283 1488
1284If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1285called.
1286 1490
1287=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1288 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
1289sub register_extcmd { 1498sub register_extcmd($$) {
1290 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1291 1500
1292 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1293} 1502}
1294 1503
1295sub register_exticmd { 1504sub register_async_extcmd($$) {
1296 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1297 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1298 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1299} 1514}
1300 1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1520}
1521
1301use File::Glob (); 1522use File::Glob ();
1302 1523
1303cf::player->attach ( 1524cf::player->attach (
1304 on_command => sub { 1525 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1526 my ($pl, $name, $params) = @_;
1306 1527
1307 my $cb = $COMMAND{$name} 1528 my $cb = $COMMAND{$name}
1308 or return; 1529 or return;
1309 1530
1317 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1318 1539
1319 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1320 1541
1321 if (ref $msg) { 1542 if (ref $msg) {
1322 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1323 "ARRAY" eq ref $msg
1324 ? @$msg
1325 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1326 1544
1327 my @reply;
1328
1329 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}) {
1330 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1331 } 1563 }
1332 1564
1333 $pl->ext_reply ($reply, @reply)
1334 if $reply;
1335
1336 } else { 1565 } else {
1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1338 } 1567 }
1339 1568
1340 cf::override; 1569 cf::override;
1341 }, 1570 },
1342); 1571);
1352 }; 1581 };
1353 1582
1354 $grp 1583 $grp
1355} 1584}
1356 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
1357sub load_extensions { 1597sub load_extensions {
1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1601
1358 cf::sync_job { 1602 cf::sync_job {
1359 my %todo; 1603 my %todo;
1360 1604
1361 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1362 next unless -r $path; 1606 next unless -r $path;
1380 1624
1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1383 1627
1384 $ext{source} = 1628 $ext{source} =
1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1386 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1387 . $source 1631 . $source
1388 . "\n};\n1"; 1632 . "\n};\n1";
1389 1633
1390 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1391 } 1635 }
1392 1636
1637 my $pass = 0;
1393 my %done; 1638 my %done;
1394 while (%todo) { 1639 while (%todo) {
1395 my $progress; 1640 my $progress;
1396 1641
1642 ++$pass;
1643
1644 ext:
1397 while (my ($k, $v) = each %todo) { 1645 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1646 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1647 next ext
1400 unless exists $done{$_}; 1648 unless exists $done{$_};
1401 } 1649 }
1402 1650
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1652
1405 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 $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1665 error "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1666
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1668 if exists $v->{meta}{mandatory};
1413 1669
1414 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;
1415 } 1679 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1680 }
1421 1681
1422 skip: 1682 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1683 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 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 }
1425 } 1692 }
1426 }; 1693 };
1427} 1694}
1428 1695
1429############################################################################# 1696#############################################################################
1513 $cf::PLAYER{$login} = $pl 1780 $cf::PLAYER{$login} = $pl
1514 } 1781 }
1515 } 1782 }
1516} 1783}
1517 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
1518sub save($) { 1798sub save($) {
1519 my ($pl) = @_; 1799 my ($pl) = @_;
1520 1800
1521 return if $pl->{deny_save}; 1801 return if $pl->{deny_save};
1522 1802
1527 1807
1528 aio_mkdir playerdir $pl, 0770; 1808 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1809 $pl->{last_save} = $cf::RUNTIME;
1530 1810
1531 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];
1532 1815
1533 $pl->save_pl ($path); 1816 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1817 cf::cede_to_tick;
1535} 1818}
1536 1819
1570 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1571 1854
1572 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1573 $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
1574 1857
1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1576 $pl->deactivate; 1859 $pl->deactivate;
1860
1577 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;
1578 $pl->ob->check_score;
1579 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1580 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1581 1866
1582 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1583 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1584 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1638 \@logins 1923 \@logins
1639} 1924}
1640 1925
1641=item $player->maps 1926=item $player->maps
1642 1927
1928=item cf::player::maps $login
1929
1643Returns an arrayref of map paths that are private for this 1930Returns an arrayref of map paths that are private for this
1644player. May block. 1931player. May block.
1645 1932
1646=cut 1933=cut
1647 1934
1668 1955
1669=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1670 1957
1671Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1672 1959
1673=item $player->ext_reply ($msgid, @msg)
1674
1675Sends an ext reply to the player.
1676
1677=cut
1678
1679sub ext_reply($$@) {
1680 my ($self, $id, @msg) = @_;
1681
1682 $self->ns->ext_reply ($id, @msg)
1683}
1684
1685=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1686 1961
1687Sends an ext event to the client. 1962Sends an ext event to the client.
1688 1963
1689=cut 1964=cut
1708 1983
1709=cut 1984=cut
1710 1985
1711sub find_by_path($) { 1986sub find_by_path($) {
1712 my ($path) = @_; 1987 my ($path) = @_;
1988
1989 $path =~ s/^~[^\/]*//; # skip ~login
1713 1990
1714 my ($match, $specificity); 1991 my ($match, $specificity);
1715 1992
1716 for my $region (list) { 1993 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1994 if ($region->{match} && $path =~ $region->{match}) {
1746sub generate_random_map { 2023sub generate_random_map {
1747 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1748 2025
1749 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
1750 2027
1751 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1760 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1761 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1762 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1763 (cf::region::find $rmp->{region}), $rmp->{custom}
1764 )
1765} 2029}
1766 2030
1767=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1768 2032
1769Register 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
1774 2038
1775sub register { 2039sub register {
1776 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1777 my $pkg = caller; 2041 my $pkg = caller;
1778 2042
1779 no strict;
1780 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1781 2044
1782 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1783} 2046}
1784 2047
1785# also paths starting with '/' 2048# also paths starting with '/'
1786$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2049$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1787 2050
1788sub thawer_merge { 2051sub thawer_merge {
1789 my ($self, $merge) = @_; 2052 my ($self, $merge) = @_;
1790 2053
1791 # we have to keep some variables in memory intact 2054 # we have to keep some variables in memory intact
1796} 2059}
1797 2060
1798sub normalise { 2061sub normalise {
1799 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1800 2063
1801 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1802 2065
1803 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1804 2067
1805 # map plan: 2068 # map plan:
1806 # 2069 #
1821 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1822 $path = "$base/$path"; 2085 $path = "$base/$path";
1823 } 2086 }
1824 2087
1825 for ($path) { 2088 for ($path) {
1826 redo if s{//}{/};
1827 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1828 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1829 } 2091 }
1830 2092
1831 $path 2093 $path
1845 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1846 return $self; 2108 return $self;
1847 } 2109 }
1848 } 2110 }
1849 2111
1850 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1851 () 2113 ()
1852} 2114}
1853 2115
2116# may re-bless or do other evil things
1854sub init { 2117sub init {
1855 my ($self) = @_; 2118 my ($self) = @_;
1856 2119
1857 $self 2120 $self
1858} 2121}
1923 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1924 2187
1925 1 2188 1
1926} 2189}
1927 2190
2191# used to laod the header of an original map
1928sub load_header_orig { 2192sub load_header_orig {
1929 my ($self) = @_; 2193 my ($self) = @_;
1930 2194
1931 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
1932} 2196}
1933 2197
2198# used to laod the header of an instantiated map
1934sub load_header_temp { 2199sub load_header_temp {
1935 my ($self) = @_; 2200 my ($self) = @_;
1936 2201
1937 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
1938} 2203}
1939 2204
2205# called after loading the header from an instantiated map
1940sub prepare_temp { 2206sub prepare_temp {
1941 my ($self) = @_; 2207 my ($self) = @_;
1942 2208
1943 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
1945 # safety 2211 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2214}
1949 2215
2216# called after loading the header from an original map
1950sub prepare_orig { 2217sub prepare_orig {
1951 my ($self) = @_; 2218 my ($self) = @_;
1952 2219
1953 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
1978 2245
1979sub find; 2246sub find;
1980sub find { 2247sub find {
1981 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
1982 2249
2250 cf::cede_to_tick;
2251
1983 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
1984 2253
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 my $guard2 = cf::lock_acquire "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2256
1988 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
2005 2274
2006 $cf::MAP{$path} = $map 2275 $cf::MAP{$path} = $map
2007 } 2276 }
2008} 2277}
2009 2278
2010sub pre_load { } 2279sub pre_load { }
2011sub post_load { } 2280#sub post_load { } # XS
2012 2281
2013sub load { 2282sub load {
2014 my ($self) = @_; 2283 my ($self) = @_;
2015 2284
2016 local $self->{deny_reset} = 1; # loading can take a long time 2285 local $self->{deny_reset} = 1; # loading can take a long time
2019 2288
2020 { 2289 {
2021 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
2022 2291
2023 return unless $self->valid; 2292 return unless $self->valid;
2024 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2025
2026 $self->in_memory (cf::MAP_LOADING);
2027 2294
2028 $self->alloc; 2295 $self->alloc;
2029 2296
2030 $self->pre_load; 2297 $self->pre_load;
2031 cf::cede_to_tick; 2298 cf::cede_to_tick;
2032 2299
2300 if (exists $self->{load_path}) {
2033 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block; 2302 $f->skip_block;
2035 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2036 or return; 2304 or return;
2037 2305
2038 $self->post_load_original 2306 $self->post_load_original
2039 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2040 2308
2041 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2042 utf8::encode $uniq; 2310 utf8::encode $uniq;
2043 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2045 $self->clear_unique_items; 2313 $self->clear_unique_items;
2046 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2048 } 2317 }
2049 } 2318 }
2050 }
2051 2319
2052 $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);
2053 2327
2054 cf::cede_to_tick; 2328 cf::cede_to_tick;
2055 # now do the right thing for maps 2329 # now do the right thing for maps
2056 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2057 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2061 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2062 $self->decay_objects; 2336 $self->decay_objects;
2063 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2064 $self->update_buttons; 2338 $self->update_buttons;
2065 cf::cede_to_tick; 2339 cf::cede_to_tick;
2066 $self->activate; 2340 #$self->activate; # no longer activate maps automatically
2067 } 2341 }
2068 2342
2069 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2070 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2071
2072 $self->in_memory (cf::MAP_ACTIVE);
2073 } 2345 }
2074 2346
2075 $self->post_load; 2347 $self->post_load;
2076}
2077 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
2078sub customise_for { 2355sub customise_for {
2079 my ($self, $ob) = @_; 2356 my ($self, $ob) = @_;
2080 2357
2081 return find "~" . $ob->name . "/" . $self->{path} 2358 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2359 if $self->per_player;
2085# if $self->per_party; 2362# if $self->per_party;
2086 2363
2087 $self 2364 $self
2088} 2365}
2089 2366
2090# find and load all maps in the 3x3 area around a map
2091sub load_neighbours {
2092 my ($map) = @_;
2093
2094 my @neigh; # diagonal neighbours
2095
2096 for (0 .. 3) {
2097 my $neigh = $map->tile_path ($_)
2098 or next;
2099 $neigh = find $neigh, $map
2100 or next;
2101 $neigh->load;
2102
2103 push @neigh,
2104 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2105 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2106 }
2107
2108 for (grep defined $_->[0], @neigh) {
2109 my ($path, $origin) = @$_;
2110 my $neigh = find $path, $origin
2111 or next;
2112 $neigh->load;
2113 }
2114}
2115
2116sub find_sync { 2367sub find_sync {
2117 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2118 2369
2119 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
2120} 2375}
2121 2376
2122sub do_load_sync { 2377sub do_load_sync {
2123 my ($map) = @_; 2378 my ($map) = @_;
2124 2379
2380 # it's a bug to call this from the main context
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2127 2383
2128 cf::sync_job { $map->load }; 2384 $map->load;
2129} 2385}
2130 2386
2131our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2132our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2133 2389
2134sub find_async { 2390sub find_async {
2135 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2136 2392
2137 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2138 2394
2139 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2396 return $map if !$load || $map->linkable;
2141 } 2397 }
2142 2398
2143 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2144 2400
2145 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2146 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2147 2403
2148 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2149 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2150 if (my $map = find $k) { 2406 if (my $map = find $k) {
2151 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2152 } 2408 }
2153 2409
2154 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2155 } 2411 }
2156 } 2412 }
2159 $MAP_PREFETCHER->prio (6); 2415 $MAP_PREFETCHER->prio (6);
2160 2416
2161 () 2417 ()
2162} 2418}
2163 2419
2420# common code, used by both ->save and ->swapout
2164sub save { 2421sub _save {
2165 my ($self) = @_; 2422 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2423
2169 $self->{last_save} = $cf::RUNTIME; 2424 $self->{last_save} = $cf::RUNTIME;
2170 2425
2171 return unless $self->dirty; 2426 return unless $self->dirty;
2172 2427
2192 } else { 2447 } else {
2193 $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);
2194 } 2449 }
2195} 2450}
2196 2451
2452sub save {
2453 my ($self) = @_;
2454
2455 my $lock = cf::lock_acquire "map_data:$self->{path}";
2456
2457 $self->_save;
2458}
2459
2197sub swap_out { 2460sub swap_out {
2198 my ($self) = @_; 2461 my ($self) = @_;
2199 2462
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2464
2465 return if !$self->linkable;
2466 return if $self->{deny_save};
2205 return if $self->players; 2467 return if $self->players;
2206 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
2207 return if $self->{deny_save}; 2485 return 1e99 if $self->{deny_reset};
2208 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
2209 $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};
2210 2519
2211 $self->deactivate; 2520 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2521 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->clear; 2522 $self->clear;
2214}
2215
2216sub reset_at {
2217 my ($self) = @_;
2218
2219 # TODO: safety, remove and allow resettable per-player maps
2220 return 1e99 if $self->{deny_reset};
2221
2222 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2223 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2224
2225 $time + $to
2226}
2227
2228sub should_reset {
2229 my ($self) = @_;
2230
2231 $self->reset_at <= $cf::RUNTIME
2232}
2233
2234sub reset {
2235 my ($self) = @_;
2236
2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2238
2239 return if $self->players;
2240
2241 warn "resetting map ", $self->path, "\n";
2242
2243 $self->in_memory (cf::MAP_SWAPPED);
2244
2245 # need to save uniques path
2246 unless ($self->{deny_save}) {
2247 my $uniq = $self->uniq_path; utf8::encode $uniq;
2248
2249 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2250 if $uniq;
2251 }
2252
2253 delete $cf::MAP{$self->path};
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear;
2258 2523
2259 $self->unlink_save; 2524 $self->unlink_save;
2260 $self->destroy; 2525 $self->destroy;
2261} 2526}
2262 2527
2270 2535
2271 delete $cf::MAP{$self->path}; 2536 delete $cf::MAP{$self->path};
2272 2537
2273 $self->unlink_save; 2538 $self->unlink_save;
2274 2539
2275 bless $self, "cf::map"; 2540 bless $self, "cf::map::wrap";
2276 delete $self->{deny_reset}; 2541 delete $self->{deny_reset};
2277 $self->{deny_save} = 1; 2542 $self->{deny_save} = 1;
2278 $self->reset_timeout (1); 2543 $self->reset_timeout (1);
2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2544 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2280 2545
2337 : normalise $_ 2602 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2603 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2604 ]
2340} 2605}
2341 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
2342=back 2639=back
2343 2640
2344=head3 cf::object 2641=head3 cf::object
2345 2642
2346=cut 2643=cut
2369 2666
2370Creates 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.
2371 2668
2372=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2373 2670
2374returns 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,
2375even if the object actually exists. May block. 2672even if the object actually exists. May block.
2376 2673
2377=cut 2674=cut
2378 2675
2379sub deref { 2676sub deref {
2461=item $player_object->may ("access") 2758=item $player_object->may ("access")
2462 2759
2463Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2464(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2465 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
2466=cut 2788=cut
2467 2789
2468sub cf::object::player::may { 2790sub cf::object::player::may {
2469 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2470 2792
2471 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2472 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2474 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2475} 2797}
2476 2798
2477=item $player_object->enter_link 2799=item $player_object->enter_link
2478 2800
2479Freezes 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}>).
2480 2802
2481The 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.
2482for 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,
2483though, 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
2484map. 2806map.
2485 2807
2486Will 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.
2487 2815
2488=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2489 2817
2490Moves 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
2491map. 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
2509sub cf::object::player::enter_link { 2837sub cf::object::player::enter_link {
2510 my ($self) = @_; 2838 my ($self) = @_;
2511 2839
2512 $self->deactivate_recursive; 2840 $self->deactivate_recursive;
2513 2841
2842 ++$self->{_link_recursion};
2843
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2844 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2845
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2846 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2847 if $self->map && $self->map->{path} ne "{link}";
2518 2848
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2849 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2850}
2521 2851
2522sub cf::object::player::leave_link { 2852sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2853 my ($self, $map, $x, $y) = @_;
2524 2854
2541 ($x, $y) = (-1, -1) 2871 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2872 unless (defined $x) && (defined $y);
2543 2873
2544 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2547 2877
2548 $map->load; 2878 $map->load;
2549 $map->load_neighbours;
2550 2879
2551 return unless $self->contr->active; 2880 return unless $self->contr->active;
2552 2881
2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2554 $self->enter_map ($map, $x, $y); 2883 if ($self->enter_map ($map, $x, $y)) {
2555 2884 # entering was successful
2885 delete $self->{_link_recursion};
2556 # only activate afterwards, to support waiting in hooks 2886 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive; 2887 $self->activate_recursive;
2558} 2888 }
2559 2889
2890}
2891
2560=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)]])
2561 2893
2562Moves 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
2563her, loading and preparing them map, calling the provided $check callback 2895her, loading and preparing them map, calling the provided $check callback
2564that 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
2565the 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
2572 2904
2573our $GOTOGEN; 2905our $GOTOGEN;
2574 2906
2575sub cf::object::player::goto { 2907sub cf::object::player::goto {
2576 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 }
2577 2915
2578 # 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
2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2917 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2580 2918
2581 $self->enter_link; 2919 $self->enter_link;
2601 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2602 } 2940 }
2603 } 2941 }
2604 2942
2605 my $map = eval { 2943 my $map = eval {
2606 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2607 2945
2608 if ($map) { 2946 if ($map) {
2609 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2610 $map = $check->($map) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2611 } else { 2949 } else {
2612 $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);
2613 } 2951 }
2614 2952
2615 $map 2953 $map
2623 if ($gen == $self->{_goto_generation}) { 2961 if ($gen == $self->{_goto_generation}) {
2624 delete $self->{_goto_generation}; 2962 delete $self->{_goto_generation};
2625 $self->leave_link ($map, $x, $y); 2963 $self->leave_link ($map, $x, $y);
2626 } 2964 }
2627 2965
2628 $done->() if $done; 2966 $done->($self) if $done;
2629 })->prio (1); 2967 })->prio (1);
2630} 2968}
2631 2969
2632=item $player_object->enter_exit ($exit_object) 2970=item $player_object->enter_exit ($exit_object)
2633 2971
2701 $Coro::current->{desc} = "enter_exit"; 3039 $Coro::current->{desc} = "enter_exit";
2702 3040
2703 unless (eval { 3041 unless (eval {
2704 $self->deactivate_recursive; # just to be sure 3042 $self->deactivate_recursive; # just to be sure
2705 3043
2706 # random map handling
2707 {
2708 my $guard = cf::lock_acquire "exit_prepare:$exit";
2709
2710 prepare_random_map $exit
2711 if $exit->slaying eq "/!";
2712 }
2713
2714 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3044 my $map = cf::map::normalise $exit->slaying, $exit->map;
2715 my $x = $exit->stats->hp; 3045 my $x = $exit->stats->hp;
2716 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 }
2717 3070
2718 $self->goto ($map, $x, $y); 3071 $self->goto ($map, $x, $y);
2719 3072
2720 # if exit is damned, update players death & WoR home-position 3073 # if exit is damned, update players death & WoR home-position
2721 $self->contr->savebed ($map, $x, $y) 3074 $self->contr->savebed ($map, $x, $y)
2726 $self->message ("Something went wrong deep within the deliantra server. " 3079 $self->message ("Something went wrong deep within the deliantra server. "
2727 . "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. "
2728 . "Please report this to the dungeon master!", 3081 . "Please report this to the dungeon master!",
2729 cf::NDI_UNIQUE | cf::NDI_RED); 3082 cf::NDI_UNIQUE | cf::NDI_RED);
2730 3083
2731 warn "ERROR in enter_exit: $@"; 3084 error "ERROR in enter_exit: $@";
2732 $self->leave_link; 3085 $self->leave_link;
2733 } 3086 }
2734 })->prio (1); 3087 })->prio (1);
2735} 3088}
2736 3089
2737=head3 cf::client 3090=head3 cf::client
2738 3091
2739=over 4 3092=over 4
2740 3093
2741=item $client->send_drawinfo ($text, $flags) 3094=item $client->send_big_packet ($pkt)
2742 3095
2743Sends a drawinfo packet to the client. Circumvents output buffering so 3096Like C<send_packet>, but tries to compress large packets, and fragments
2744should not be used under normal circumstances. 3097them as required.
2745 3098
2746=cut 3099=cut
2747 3100
3101our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3102
2748sub cf::client::send_drawinfo { 3103sub cf::client::send_big_packet {
2749 my ($self, $text, $flags) = @_; 3104 my ($self, $pkt) = @_;
2750 3105
2751 utf8::encode $text; 3106 # try lzf for large packets
2752 $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);
2753} 3117}
2754 3118
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 3120
2757Send 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
2758client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2759the 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
2760the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2761 3125
2762=cut 3126=cut
2763 3127
2764# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 3129our %CHANNEL = (
3130 "c/motd" => {
3131 id => "infobox",
3132 title => "MOTD",
3133 reply => undef,
3134 tooltip => "The message of the day",
3135 },
2766 "c/identify" => { 3136 "c/identify" => {
2767 id => "infobox", 3137 id => "infobox",
2768 title => "Identify", 3138 title => "Identify",
2769 reply => undef, 3139 reply => undef,
2770 tooltip => "Items recently identified", 3140 tooltip => "Items recently identified",
2772 "c/examine" => { 3142 "c/examine" => {
2773 id => "infobox", 3143 id => "infobox",
2774 title => "Examine", 3144 title => "Examine",
2775 reply => undef, 3145 reply => undef,
2776 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",
2777 }, 3153 },
2778 "c/book" => { 3154 "c/book" => {
2779 id => "infobox", 3155 id => "infobox",
2780 title => "Book", 3156 title => "Book",
2781 reply => undef, 3157 reply => undef,
2795 }, 3171 },
2796 "c/body" => { 3172 "c/body" => {
2797 id => "infobox", 3173 id => "infobox",
2798 title => "Body Parts", 3174 title => "Body Parts",
2799 reply => undef, 3175 reply => undef,
2800 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
2801 }, 3177 },
2802 "c/statistics" => { 3178 "c/statistics" => {
2803 id => "infobox", 3179 id => "infobox",
2804 title => "Statistics", 3180 title => "Statistics",
2805 reply => undef, 3181 reply => undef,
2857 id => "death", 3233 id => "death",
2858 title => "Death", 3234 title => "Death",
2859 reply => undef, 3235 reply => undef,
2860 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
2861 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
2862 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
2863 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
2864); 3246);
2865 3247
2866sub cf::client::send_msg { 3248sub cf::client::send_msg {
2897 my $pkt = "msg " 3279 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3280 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3281 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3282 );
2901 3283
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3284 $self->send_big_packet ($pkt);
2913} 3285}
2914 3286
2915=item $client->ext_msg ($type, @msg) 3287=item $client->ext_msg ($type, @msg)
2916 3288
2917Sends an ext event to the client. 3289Sends an ext event to the client.
2919=cut 3291=cut
2920 3292
2921sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
2923 3295
2924 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930}
2931
2932=item $client->ext_reply ($msgid, @msg)
2933
2934Sends an ext reply to the client.
2935
2936=cut
2937
2938sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_;
2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948} 3297}
2949 3298
2950=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
2951 3300
2952Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
2972 3321
2973 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
2974 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
2975 3324
2976 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;
2977} 3365}
2978 3366
2979cf::client->attach ( 3367cf::client->attach (
2980 on_connect => sub { 3368 on_connect => sub {
2981 my ($ns) = @_; 3369 my ($ns) = @_;
3007 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
3008 3396
3009 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3010 3398
3011 if (ref $msg) { 3399 if (ref $msg) {
3012 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3013 "ARRAY" eq ref $msg
3014 ? @$msg
3015 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3016 3401
3017 my @reply;
3018
3019 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}) {
3020 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3021 } 3420 }
3022
3023 $ns->ext_reply ($reply, @reply)
3024 if $reply;
3025
3026 } else { 3421 } else {
3027 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";
3028 } 3423 }
3029 3424
3030 cf::override; 3425 cf::override;
3031 }, 3426 },
3032); 3427);
3052 3447
3053 $coro 3448 $coro
3054} 3449}
3055 3450
3056cf::client->attach ( 3451cf::client->attach (
3057 on_destroy => sub { 3452 on_client_destroy => sub {
3058 my ($ns) = @_; 3453 my ($ns) = @_;
3059 3454
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3455 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3456 },
3062); 3457);
3078our $safe_hole = new Safe::Hole; 3473our $safe_hole = new Safe::Hole;
3079 3474
3080$SIG{FPE} = 'IGNORE'; 3475$SIG{FPE} = 'IGNORE';
3081 3476
3082$safe->permit_only (Opcode::opset qw( 3477$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3478 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3479 grepstart grepwhile mapstart mapwhile
3085 sort time 3480 sort time
3086)); 3481));
3087 3482
3088# here we export the classes and methods available to script code 3483# here we export the classes and methods available to script code
3113 decrease split destroy change_exp value msg lore send_msg)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3114 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3115 ["cf::player" => qw(peaceful send_msg)], 3510 ["cf::player" => qw(peaceful send_msg)],
3116 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3117) { 3512) {
3118 no strict 'refs';
3119 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3121 for @funs; 3515 for @funs;
3122} 3516}
3123 3517
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3534 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3535 $qcode =~ s/\n/\\n/g;
3142 3536
3143 %vars = (_dummy => 0) unless %vars; 3537 %vars = (_dummy => 0) unless %vars;
3144 3538
3539 my @res;
3145 local $_; 3540 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3541
3148 my $eval = 3542 my $eval =
3149 "do {\n" 3543 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3544 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3545 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3546 . $code
3153 . "\n}" 3547 . "\n}"
3154 ; 3548 ;
3155 3549
3550 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3551 sub_generation_inc;
3552 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3553 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 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 }
3159 3559
3160 if ($@) { 3560 if ($@) {
3161 warn "$@"; 3561 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3562 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3563 "with arguments " . (join " ", %vars) . "\n";
3164 } 3564 }
3165 3565
3166 wantarray ? @res : $res[0] 3566 wantarray ? @res : $res[0]
3167} 3567}
3168 3568
3182=cut 3582=cut
3183 3583
3184sub register_script_function { 3584sub register_script_function {
3185 my ($fun, $cb) = @_; 3585 my ($fun, $cb) = @_;
3186 3586
3187 no strict 'refs'; 3587 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3588 *$fun = $safe_hole->wrap ($cb);
3189} 3589}
3190 3590
3191=back 3591=back
3192 3592
3193=cut 3593=cut
3194 3594
3195############################################################################# 3595#############################################################################
3196# the server's init and main functions 3596# the server's init and main functions
3197 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
3198sub load_facedata($) { 3675sub load_facedata($) {
3199 my ($path) = @_; 3676 my ($path) = @_;
3200 3677
3201 # HACK to clear player env face cache, we need some signal framework
3202 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = ();
3204
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3679
3207 warn "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3208 3681
3209 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3210 0 < aio_load $path, $facedata
3211 or die "$path: $!";
3212
3213 $facedata = Coro::Storable::thaw $facedata;
3214 3683
3215 $facedata->{version} == 2 3684 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3217 3686
3218 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3219 $facedata->{resource}{"res/exp_table"} = { 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3220 type => FT_RSRC, 3689
3221 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
3222 }; 3691
3223 cf::cede_to_tick; 3692 # BEGIN ATOMIC
3693 # from here on, everything must be atomic - no thread switch allowed
3694 my $t1 = EV::time;
3224 3695
3225 { 3696 {
3226 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3227 3698
3228 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3702
3231 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3233 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};
3234 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};
3235 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3236 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3237 } 3710 }
3238 3711
3239 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3240 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3241 3714
3244 3717
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3718 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3721 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3723 }
3251
3252 cf::cede_to_tick;
3253 } 3724 }
3254 } 3725 }
3255 3726
3256 { 3727 {
3257 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3258 3729
3259 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3260 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3261 cf::cede_to_tick;
3262 } 3732 }
3263 3733
3264 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3265 } 3735 }
3266 3736
3267 { 3737 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3271 3739
3272 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3273 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
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3744
3277 if ($info->{type} & 1) {
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 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;
3292 } else { 3751 } else {
3293 $RESOURCE{$name} = $info; 3752# $RESOURCE{$name} = $info; # unused
3294 } 3753 }
3295
3296 cf::cede_to_tick;
3297 } 3754 }
3298 } 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;
3299 3766
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3768
3769 aio_close $fh if $fh; # close old facedata
3770
3302 1 3771 1
3303} 3772}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3773
3325register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3775 my ($ns, $want) = @_;
3327 3776
3328 while (my ($k, $v) = each %$want) { 3777 while (my ($k, $v) = each %$want) {
3336 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3338 cf::arch::commit_load; 3787 cf::arch::commit_load;
3339 3788
3340 $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;
3341} 3804}
3342 3805
3343sub reload_regions { 3806sub reload_regions {
3344 # 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
3345 # for this (global event?) 3808 # for this (global event?)
3353 if exists $_->{match}; 3816 if exists $_->{match};
3354 } 3817 }
3355} 3818}
3356 3819
3357sub reload_facedata { 3820sub reload_facedata {
3358 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3359 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3360} 3823}
3361 3824
3362sub reload_archetypes { 3825sub reload_archetypes {
3363 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3364 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;
3365} 3854}
3366 3855
3367sub reload_treasures { 3856sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3370} 3859}
3371 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
3372sub reload_resources { 3881sub reload_resources {
3373 warn "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3374 3883
3884 reload_materials;
3375 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3887 reload_sound;
3376 reload_archetypes; 3888 reload_archetypes;
3377 reload_regions; 3889 reload_regions;
3378 reload_treasures; 3890 reload_treasures;
3379 3891
3380 warn "finished reloading resource files\n"; 3892 trace "finished reloading resource files\n";
3381} 3893}
3382 3894
3383sub reload_config { 3895sub reload_config {
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3896 trace "reloading config file...\n";
3385 or return;
3386 3897
3387 local $/; 3898 my $config = load_file "$CONFDIR/config";
3388 *CFG = YAML::Load <$fh>; 3899 utf8::decode $config;
3900 *CFG = decode_yaml $config;
3389 3901
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3903
3392 $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};
3393 $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};
3394 3906
3395 if (exists $CFG{mlockall}) { 3907 if (exists $CFG{mlockall}) {
3419 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3420 print $fh $$; 3932 print $fh $$;
3421} 3933}
3422 3934
3423sub main_loop { 3935sub main_loop {
3424 warn "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3425 if (1) { 3937 if (1) {
3426 EV::loop; 3938 EV::run;
3427 } 3939 }
3428 warn "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3430} 3942}
3431 3943
3432sub main { 3944sub main {
3433 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3434 3946
3435 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.";
3436 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.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439 3952
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444
3445 $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
3446 3954
3447 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3449 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#
3450 (async { 3958 (async {
3451 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3452 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3453 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3454 }; 3962 };
3455 3963
3456 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3457 3965
3458 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
3459 reload_resources; 3977 reload_resources;
3460 reload_config; 3978 reload_config;
3461 db_init;
3462 3979
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3980 cf::init_uuid;
3466 cf::init_signals; 3981 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3982 cf::init_skills;
3469 3983
3470 cf::init_beforeplay; 3984 cf::init_beforeplay;
3471 3985
3472 atomic; 3986 atomic;
3477 3991
3478 # no (long-running) fork's whatsoever before this point(!) 3992 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX (); 3993 use POSIX ();
3480 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};
3481 3995
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3996 cf::_post_init 0;
3483 }; 3997 };
3484 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
3485 main_loop; 4006 goto &main_loop;
3486} 4007}
3487 4008
3488############################################################################# 4009#############################################################################
3489# initialisation and cleanup 4010# initialisation and cleanup
3490 4011
3491# install some emergency cleanup handlers 4012# install some emergency cleanup handlers
3492BEGIN { 4013BEGIN {
3493 our %SIGWATCHER = (); 4014 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 4015 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4016 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 4017 cf::cleanup "SIG$signal";
3497 }; 4018 };
3498 } 4019 }
3499} 4020}
3500 4021
3501sub write_runtime_sync { 4022sub write_runtime_sync {
4023 my $t0 = AE::time;
4024
3502 # first touch the runtime file to show we are still running: 4025 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 4026 # the fsync below can take a very very long time.
3504 4027
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4028 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 4029
3507 my $guard = cf::lock_acquire "write_runtime"; 4030 my $guard = cf::lock_acquire "write_runtime";
3508 4031
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4032 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 4033 or return;
3511 4034
3512 my $value = $cf::RUNTIME + 90 + 10; 4035 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 4036 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 4037 # 60 allows for the watchdog to kill the server.
3527 or return; 4050 or return;
3528 4051
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4052 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 4053 and return;
3531 4054
3532 warn "runtime file written.\n"; 4055 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 4056
3534 1 4057 1
3535} 4058}
3536 4059
3537our $uuid_lock; 4060our $uuid_lock;
3549 or return; 4072 or return;
3550 4073
3551 my $value = uuid_seq uuid_cur; 4074 my $value = uuid_seq uuid_cur;
3552 4075
3553 unless ($value) { 4076 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n"; 4077 info "cowardly refusing to write zero uuid value!\n";
3555 return; 4078 return;
3556 } 4079 }
3557 4080
3558 my $value = uuid_str $value + $uuid_skip; 4081 my $value = uuid_str $value + $uuid_skip;
3559 $uuid_skip = 0; 4082 $uuid_skip = 0;
3569 or return; 4092 or return;
3570 4093
3571 aio_rename "$uuid~", $uuid 4094 aio_rename "$uuid~", $uuid
3572 and return; 4095 and return;
3573 4096
3574 warn "uuid file written ($value).\n"; 4097 trace "uuid file written ($value).\n";
3575 4098
3576 1 4099 1
3577 4100
3578} 4101}
3579 4102
3585} 4108}
3586 4109
3587sub emergency_save() { 4110sub emergency_save() {
3588 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3589 4112
3590 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;
3591 4119
3592 cf::sync_job { 4120 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so 4121 cf::write_runtime_sync; # external watchdog should not bark
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597 4122
3598 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3599 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3600 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3601 warn "emergency_perl_save: begin player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3602 for my $login (keys %cf::PLAYER) { 4127 for my $login (keys %cf::PLAYER) {
3603 my $pl = $cf::PLAYER{$login} or next; 4128 my $pl = $cf::PLAYER{$login} or next;
3604 $pl->valid or next; 4129 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3606 $pl->save; 4131 $pl->save;
3607 } 4132 }
3608 warn "emergency_perl_save: end player save\n"; 4133 info "emergency_perl_save: end player save\n";
3609 4134
4135 cf::write_runtime_sync; # external watchdog should not bark
4136
3610 warn "emergency_perl_save: begin map save\n"; 4137 info "emergency_perl_save: begin map save\n";
3611 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3612 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3613 $map->valid or next; 4140 $map->valid or next;
3614 $map->save; 4141 $map->save;
3615 } 4142 }
3616 warn "emergency_perl_save: end map save\n"; 4143 info "emergency_perl_save: end map save\n";
3617 4144
4145 cf::write_runtime_sync; # external watchdog should not bark
4146
3618 warn "emergency_perl_save: begin database checkpoint\n"; 4147 info "emergency_perl_save: begin database checkpoint\n";
3619 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3620 warn "emergency_perl_save: end database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
3621 4150
3622 warn "emergency_perl_save: begin write uuid\n"; 4151 info "emergency_perl_save: begin write uuid\n";
3623 write_uuid_sync 1; 4152 write_uuid_sync 1;
3624 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
3625 }; 4173 };
3626 4174
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3632 warn "emergency_perl_save: leave\n"; 4175 info "emergency_perl_save: leave\n";
3633} 4176}
3634 4177
3635sub post_cleanup { 4178sub post_cleanup {
3636 my ($make_core) = @_; 4179 my ($make_core) = @_;
3637 4180
4181 IO::AIO::flush;
4182
3638 warn Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3639 if $make_core; 4184 if $make_core;
3640 4185
3641 my $fh = pidfile; 4186 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$; 4187 unlink $PIDFILE if <$fh> == $$;
3643} 4188}
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4208 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 4209 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 4210 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4211# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 4212 }
3668 warn "cleared package $pkg\n";#d#
3669} 4213}
3670 4214
3671sub do_reload_perl() { 4215sub do_reload_perl() {
3672 # can/must only be called in main 4216 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 4217 unless (in_main) {
3674 warn "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3675 return; 4219 return;
3676 } 4220 }
3677 4221
3678 return if $RELOAD++; 4222 return if $RELOAD++;
3679 4223
3680 my $t1 = EV::time; 4224 my $t1 = AE::time;
3681 4225
3682 while ($RELOAD) { 4226 while ($RELOAD) {
3683 warn "reloading..."; 4227 cf::get_slot 0.1, -1, "reload_perl";
4228 info "perl_reload: reloading...";
3684 4229
3685 warn "entering sync_job"; 4230 trace "perl_reload: entering sync_job";
3686 4231
3687 cf::sync_job { 4232 cf::sync_job {
3688 cf::write_runtime_sync; # external watchdog should not bark
3689 cf::emergency_save; 4233 #cf::emergency_save;
3690 cf::write_runtime_sync; # external watchdog should not bark
3691 4234
3692 warn "syncing database to disk";
3693 BDB::db_env_txn_checkpoint $DB_ENV;
3694
3695 # if anything goes wrong in here, we should simply crash as we already saved
3696
3697 warn "flushing outstanding aio requests";
3698 while (IO::AIO::nreqs || BDB::nreqs) {
3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3700 }
3701
3702 warn "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3703 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3704 %EXT_CORO = (); 4237 %EXT_CORO = ();
3705 4238
3706 warn "removing commands"; 4239 trace "perl_reload: removing commands";
3707 %COMMAND = (); 4240 %COMMAND = ();
3708 4241
3709 warn "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3710 %EXTCMD = (); 4243 %EXTCMD = ();
3711 %EXTICMD = (); 4244 %EXTICMD = ();
3712 4245
3713 warn "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3714 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3715 warn "... unloading $pkg"; 4248 trace "... unloading $pkg";
3716 4249
3717 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3718 eval { 4251 eval {
3719 $cb->($pkg); 4252 $cb->($pkg);
3720 1 4253 1
3721 } or warn "$pkg unloaded, but with errors: $@"; 4254 } or error "$pkg unloaded, but with errors: $@";
3722 } 4255 }
3723 4256
3724 warn "... clearing $pkg"; 4257 trace "... clearing $pkg";
3725 clear_package $pkg; 4258 clear_package $pkg;
3726 } 4259 }
3727 4260
3728 warn "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731 4264
3732 warn "... unloading $k"; 4265 trace "... unloading $k";
3733 delete $INC{$k}; 4266 delete $INC{$k};
3734 4267
3735 $k =~ s/\.pm$//; 4268 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g; 4269 $k =~ s/\//::/g;
3737 4270
3740 } 4273 }
3741 4274
3742 clear_package $k; 4275 clear_package $k;
3743 } 4276 }
3744 4277
3745 warn "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3746 clear_package "safe::$_" 4279 clear_package "safe::$_"
3747 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);
3748 4281
3749 warn "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3750 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3752 4285
3753 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3754 # and global variables created in xs 4287 # and global variables created in xs
3755 #clear_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3756 4289
3757 warn "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3758 4291
3759 warn "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3760 require cf; 4293 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4294 cf::_connect_to_perl_1;
3762 4295
3763 warn "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3764 cf::reload_config; 4297 cf::reload_config;
3765 4298
3766 warn "loading extensions"; 4299 trace "perl_reload: loading extensions";
3767 cf::load_extensions; 4300 cf::load_extensions;
3768 4301
3769 if ($REATTACH_ON_RELOAD) { 4302 if ($REATTACH_ON_RELOAD) {
3770 warn "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3771 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3772 warn "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3773 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3774 warn "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3775 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
3776 } 4309 }
3777 4310
3778 warn "running post_init jobs"; 4311 cf::_post_init 1;
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780 4312
3781 warn "leaving sync_job"; 4313 trace "perl_reload: leaving sync_job";
3782 4314
3783 1 4315 1
3784 } or do { 4316 } or do {
3785 warn $@; 4317 error $@;
3786 cf::cleanup "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3787 }; 4319 };
3788 4320
3789 warn "reloaded";
3790 --$RELOAD; 4321 --$RELOAD;
3791 } 4322 }
3792 4323
3793 $t1 = EV::time - $t1; 4324 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 4325 info "perl_reload: completed in ${t1}s\n";
3795}; 4326};
3796 4327
3797our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3798 4329
3799sub reload_perl() { 4330sub reload_perl() {
3801 # coro crashes during coro_state_free->destroy here. 4332 # coro crashes during coro_state_free->destroy here.
3802 4333
3803 $RELOAD_WATCHER ||= cf::async { 4334 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 4335 Coro::AIO::aio_wait cache_extensions;
3805 4336
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4337 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 4338 do_reload_perl;
3808 undef $RELOAD_WATCHER; 4339 undef $RELOAD_WATCHER;
3809 }; 4340 };
3810 }; 4341 };
3811} 4342}
3820 reload_perl; 4351 reload_perl;
3821 }; 4352 };
3822 } 4353 }
3823}; 4354};
3824 4355
3825unshift @INC, $LIBDIR; 4356#############################################################################
3826 4357
3827my $bug_warning = 0; 4358my $bug_warning = 0;
3828 4359
3829our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN;
3831
3832sub wait_for_tick { 4360sub wait_for_tick() {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3834 4362
3835 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3836 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait;
3838} 4364}
3839 4365
3840sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3842 4368
3843 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 4371 $signal->wait;
3846} 4372}
3850 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"
3851 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
3852 return; 4378 return;
3853 } 4379 }
3854 4380
3855 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#
3856 4384
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $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.;
3859 Coro::async_pool { 4387 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 4388 $Coro::current->{desc} = "runtime saver";
3861 write_runtime_sync 4389 write_runtime_sync
3862 or warn "ERROR: unable to write runtime file: $!"; 4390 or error "ERROR: unable to write runtime file: $!";
3863 }; 4391 };
3864 } 4392 }
3865 4393
3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3867 $sig->send; 4395 $sig->send;
3868 } 4396 }
3869 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
3870 $sig->send;
3871 }
3872 4398
3873 $LOAD = ($NOW - $TICK_START) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3875 4401
3876 if (0) { 4402 if (0) {
3877 if ($NEXT_TICK) { 4403 if ($NEXT_TICK) {
3878 my $jitter = $TICK_START - $NEXT_TICK; 4404 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4405 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d# 4406 debug "jitter $JITTER\n";#d#
3881 } 4407 }
3882 } 4408 }
3883} 4409}
3884 4410
3885{ 4411{
3886 # configure BDB 4412 # configure BDB
4413 info "initialising database";
3887 4414
3888 BDB::min_parallel 8; 4415 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
3891 4418
3892 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
3894 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3895 $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;
3920 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3921 }; 4448 };
3922 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3923 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3924 }; 4451 };
4452
4453 info "database initialised";
3925} 4454}
3926 4455
3927{ 4456{
3928 # configure IO::AIO 4457 # configure IO::AIO
3929 4458
4459 info "initialising aio";
3930 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
3931 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
3932 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
3933} 4464}
3934 4465
3935my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
3936 4468
3937sub _log_backtrace { 4469sub _log_backtrace {
3938 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
3939 4471
3940 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
3941 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3942 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
3943 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
3944 ++$_log_backtrace; 4480 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg; 4481 my $perl_bt = Carp::longmess $msg;
3946 async { 4482 async {
3947 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
3948 4484
3968 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
3969 --$_log_backtrace; 4505 --$_log_backtrace;
3970 }; 4506 };
3971 } else { 4507 } else {
3972 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
3973 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3974 } 4510 }
3975} 4511}
3976 4512
3977# load additional modules 4513# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4514require "cf/$_.pm" for @EXTRA_MODULES;
4515cf::_connect_to_perl_2;
3979 4516
3980END { cf::emergency_save } 4517END { cf::emergency_save }
3981 4518
39821 45191
3983 4520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines