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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines