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.501 by root, Sat Jan 16 23:27:21 2010 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
62use CBOR::XS ();
60use IO::AIO (); 63use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 64use Compress::LZF;
63use Digest::MD5 (); 65use Digest::MD5 ();
64 66
65AnyEvent::detect; 67AnyEvent::detect;
66 68
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %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;
112 126
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 129our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 135our $DB_ENV;
122 136
123our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 138
125our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 141
127our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
129our $NOW; 145our $NOW;
130 146
131our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
142 158
143our @POST_INIT; 159our @POST_INIT;
144 160
145our $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)
146our $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;
147 166
148binmode STDOUT; 167binmode STDOUT;
149binmode STDERR; 168binmode STDERR;
150 169
151# read virtual server time, if available 170# read virtual server time, if available
162 181
163our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
164 183
165sub cf::map::normalise; 184sub cf::map::normalise;
166 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
167############################################################################# 190#############################################################################
168 191
169%REFLECT = (); 192%REFLECT = ();
170for (@REFLECT) { 193for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 194 my $reflect = JSON::XS::decode_json $_;
181 204
182=over 4 205=over 4
183 206
184=item $cf::UPTIME 207=item $cf::UPTIME
185 208
186The 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.
187 225
188=item $cf::RUNTIME 226=item $cf::RUNTIME
189 227
190The 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
191every server tick. 229every server tick.
192 230
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 234
197Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
200database environment. 238database environment.
201 239
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 240=item $cf::LOADAVG
211 241
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
222Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223from wherever your confdir points to. 253from wherever your confdir points to.
224 254
225=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
226 256
227These 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.
228returns 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
229per 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();
230 278
231=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
232 280
233This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 282C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 290
243=back 291=back
244 292
245=cut 293=cut
246 294
295sub error(@) { LOG llevError, join "", @_ }
296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
247$Coro::State::WARNHOOK = sub { 301$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 302 my $msg = join "", @_;
249 303
250 $msg .= "\n" 304 $msg .= "\n"
251 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
252 306
253 $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;
254 308
255 LOG llevError, $msg; 309 LOG llevWarn, $msg;
256}; 310};
257 311
258$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
260 314
261 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
262 316
263 if ($Coro::current == $Coro::main) {#d# 317 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 319 return;#d#
266 }#d# 320 }#d#
267 321
268 # kill coroutine otherwise 322 # kill coroutine otherwise
269 Coro::terminate 323 Coro::terminate
289)) { 343)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 345}
292 346
293$EV::DIED = sub { 347$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
295}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
296 355
297############################################################################# 356#############################################################################
298 357
299=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
300 359
321 $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;
322 $d 381 $d
323 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
324} 383}
325 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
326=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
327 438
328Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
329 440
330=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
336our $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
337 448
338sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
342 498
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
345 501
346The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 503is a reload or not.
348 504
349=cut 505=cut
350 506
351sub post_init(&) { 507sub post_init(&) {
352 push @POST_INIT, shift; 508 push @POST_INIT, shift;
353} 509}
354 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
355=item cf::lock_wait $string 528=item cf::lock_wait $string
356 529
357Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
358 531
359=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
360 533
361Wait 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
362a 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,
396} 569}
397 570
398=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
399 572
400Like 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
401get spread over timer. 574get spread over time.
402 575
403=cut 576=cut
404 577
405sub periodic($$) { 578sub periodic($$) {
406 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
411} 584}
412 585
413=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
414 587
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 595
419The 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
420used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
421 598
422Useful for short background jobs. 599Useful for short background jobs.
423 600
424=cut 601=cut
425 602
426our @SLOT_QUEUE; 603our @SLOT_QUEUE;
427our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
428 606
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
432 610
433 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
434 613
435 while () { 614 while () {
436 next_job: 615 next_job:
616
617 Coro::cede;
618
437 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 620
439 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 625 $job->[2]->send;
443 Coro::cede;
444 goto next_job; 626 goto next_job;
445 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 629 }
447 } 630 }
448 631
449 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
451 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait;
453 } else { 634 } else {
635 $busy = 0;
454 Coro::schedule; 636 Coro::schedule;
455 } 637 }
456 } 638 }
457}; 639};
458 640
459sub get_slot($;$$) { 641sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
461 643
462 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
463 645
464 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
465 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
466 649
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
481BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
482 665
483=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
484 667
485The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
486is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
487partly 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
488acceptable. 671acceptable.
489 672
490If 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
491the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
495=cut 678=cut
496 679
497sub sync_job(&) { 680sub sync_job(&) {
498 my ($job) = @_; 681 my ($job) = @_;
499 682
500 if ($Coro::current == $Coro::main) { 683 if (in_main) {
501 my $time = EV::time; 684 my $time = AE::time;
502 685
503 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
505 688
506 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
507 690
508 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
509 692
510 my $busy = 1; 693 my $busy = 1;
511 my @res; 694 my @res;
512 695
513 (async { 696 (async {
514 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 698 @res = eval { $job->() };
516 warn $@ if $@; 699 error $@ if $@;
517 undef $busy; 700 undef $busy;
518 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
519 702
520 while ($busy) { 703 while ($busy) {
521 if (Coro::nready) { 704 if (Coro::nready) {
522 Coro::cede_notself; 705 Coro::cede_notself;
523 } else { 706 } else {
524 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
525 } 708 }
526 } 709 }
527 710
528 my $time = EV::time - $time; 711 my $time = AE::time - $time;
529 712
530 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
531 714
532 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
533 } else { 716 } else {
555 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
556 739
557 $coro 740 $coro
558} 741}
559 742
560=item fork_call { }, $args 743=item fork_call { }, @args
561 744
562Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 748never block itself or use any form of event handling.
566 749
567=cut 750=cut
568 751
752sub post_fork {
753 reset_signals;
754}
755
569sub fork_call(&@) { 756sub fork_call(&@) {
570 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
571 758
572 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious)
575
576 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
577 reset_signals; 760 cf::post_fork;
578 &$cb 761 &$cb
579 }, @args; 762 } @args;
580 763
581 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 )
582} 776}
583 777
584=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
585 779
586=cut 780=cut
623within each server. 817within each server.
624 818
625=cut 819=cut
626 820
627sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
628 my ($name) = @_; 825 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
630 827
631 eval { 828 eval {
632 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
642} 839}
643 840
644our $DB; 841our $DB;
645 842
646sub db_init { 843sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
649 };
650} 845}
651 846
652sub db_get($$) { 847sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
654 849
655 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
656 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
657 854
658 $! ? () 855 $! ? ()
659 : $data 856 : $data
660 }
661} 857}
662 858
663sub db_put($$$) { 859sub db_put($$$) {
664 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 889
694 my @data; 890 my @data;
695 my $md5; 891 my $md5;
696 892
697 for (0 .. $#$src) { 893 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 895 }
701 896
702 # if processing is expensive, check 897 # if processing is expensive, check
703 # checksum first 898 # checksum first
704 if (1) { 899 if (1) {
717 912
718 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
719 } 914 }
720 } 915 }
721 916
722 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
723 my $data = $process->(\@data); 918 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
725 920
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 922
728 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
731 926
741 936
742=cut 937=cut
743 938
744sub datalog($@) { 939sub datalog($@) {
745 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 942}
748 943
749=back 944=back
750 945
751=cut 946=cut
946 1141
947 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1144
950 } elsif (ref $type) { 1145 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
952 1147
953 } else { 1148 } else {
954 shift @arg; 1149 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
956 } 1151 }
957 } 1152 }
958} 1153}
959 1154
960sub _object_attach { 1155sub _object_attach {
970 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
971 } 1166 }
972 1167
973 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
974 } else { 1169 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1171 }
977 1172
978 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
979} 1174}
980 1175
1039 1234
1040 for (@$callbacks) { 1235 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1042 1237
1043 if ($@) { 1238 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1240 override;
1047 } 1241 }
1048 1242
1049 return 1 if $override; 1243 return 1 if $override;
1050 } 1244 }
1129 for (@$attach) { 1323 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1132 } 1326 }
1133 } else { 1327 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1329 }
1136 } 1330 }
1137} 1331}
1138 1332
1139cf::attachable->attach ( 1333cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1167 1361
1168 sync_job { 1362 sync_job {
1169 if (length $$rdata) { 1363 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1173 1368
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1372 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1200 1395
1201 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1398 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1205 } 1400 }
1206 } else { 1401 } else {
1207 aio_unlink $filename; 1402 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1209 } 1404 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1429 $av = $st->{objs};
1235 } 1430 }
1236 1431
1237 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1240 1436
1241 ($data, $av) 1437 ($data, $av)
1242} 1438}
1243 1439
1244=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1248=cut 1444=cut
1249 1445
1250############################################################################# 1446#############################################################################
1251# command handling &c 1447# command handling &c
1252 1448
1253=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1254 1450
1255Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1256$name. 1452$name.
1257 1453
1258=cut 1454=cut
1264 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1265 1461
1266 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1267} 1463}
1268 1464
1269=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1270 1466
1271Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1272extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1273received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1274the 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
1275has logged in successfully. 1471has logged in successfully.
1276 1472
1277If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1278called.
1279 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
1280=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1281 1481
1282Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1283exticmd 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
1284are 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
1285is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1286log-in. 1486log-in.
1287 1487
1288If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1289called.
1290 1489
1291=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1292 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
1293sub register_extcmd { 1497sub register_extcmd($$) {
1294 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1295 1499
1296 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1297} 1501}
1298 1502
1299sub register_exticmd { 1503sub register_async_extcmd($$) {
1300 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1301 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1302 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1303} 1513}
1304 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1305use File::Glob (); 1521use File::Glob ();
1306 1522
1307cf::player->attach ( 1523cf::player->attach (
1308 on_command => sub { 1524 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1310 1526
1311 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1312 or return; 1528 or return;
1313 1529
1321 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1322 1538
1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324 1540
1325 if (ref $msg) { 1541 if (ref $msg) {
1326 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330 1543
1331 my @reply;
1332
1333 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}) {
1334 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1335 } 1562 }
1336 1563
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1340 } else { 1564 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1566 }
1343 1567
1344 cf::override; 1568 cf::override;
1345 }, 1569 },
1346); 1570);
1356 }; 1580 };
1357 1581
1358 $grp 1582 $grp
1359} 1583}
1360 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
1361sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1362 cf::sync_job { 1601 cf::sync_job {
1363 my %todo; 1602 my %todo;
1364 1603
1365 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1605 next unless -r $path;
1384 1623
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1626
1388 $ext{source} = 1627 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1391 . $source 1630 . $source
1392 . "\n};\n1"; 1631 . "\n};\n1";
1393 1632
1394 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1395 } 1634 }
1396 1635
1636 my $pass = 0;
1397 my %done; 1637 my %done;
1398 while (%todo) { 1638 while (%todo) {
1399 my $progress; 1639 my $progress;
1400 1640
1641 ++$pass;
1642
1643 ext:
1401 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1646 next ext
1404 unless exists $done{$_}; 1647 unless exists $done{$_};
1405 } 1648 }
1406 1649
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1651
1409 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 $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1665
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1667 if exists $v->{meta}{mandatory};
1417 1668
1418 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;
1419 } 1678 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1679 }
1425 1680
1426 skip: 1681 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 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 }
1429 } 1691 }
1430 }; 1692 };
1431} 1693}
1432 1694
1433############################################################################# 1695#############################################################################
1517 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1518 } 1780 }
1519 } 1781 }
1520} 1782}
1521 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
1522sub save($) { 1797sub save($) {
1523 my ($pl) = @_; 1798 my ($pl) = @_;
1524 1799
1525 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1526 1801
1531 1806
1532 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1534 1809
1535 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];
1536 1814
1537 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1816 cf::cede_to_tick;
1539} 1817}
1540 1818
1574 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1575 1853
1576 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1577 $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
1578 1856
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1858 $pl->deactivate;
1859
1581 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;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1584 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1585 1865
1586 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1642 \@logins 1922 \@logins
1643} 1923}
1644 1924
1645=item $player->maps 1925=item $player->maps
1646 1926
1927=item cf::player::maps $login
1928
1647Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1648player. May block. 1930player. May block.
1649 1931
1650=cut 1932=cut
1651 1933
1672 1954
1673=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674 1956
1675Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1676 1958
1677=item $player->ext_reply ($msgid, @msg)
1678
1679Sends an ext reply to the player.
1680
1681=cut
1682
1683sub ext_reply($$@) {
1684 my ($self, $id, @msg) = @_;
1685
1686 $self->ns->ext_reply ($id, @msg)
1687}
1688
1689=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1690 1960
1691Sends an ext event to the client. 1961Sends an ext event to the client.
1692 1962
1693=cut 1963=cut
1712 1982
1713=cut 1983=cut
1714 1984
1715sub find_by_path($) { 1985sub find_by_path($) {
1716 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1717 1989
1718 my ($match, $specificity); 1990 my ($match, $specificity);
1719 1991
1720 for my $region (list) { 1992 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1750sub generate_random_map { 2022sub generate_random_map {
1751 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1752 2024
1753 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
1754 2026
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 2028}
1770 2029
1771=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1772 2031
1773Register 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
1778 2037
1779sub register { 2038sub register {
1780 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 2040 my $pkg = caller;
1782 2041
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 2043
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 2045}
1788 2046
1789# also paths starting with '/' 2047# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 2049
1792sub thawer_merge { 2050sub thawer_merge {
1793 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1794 2052
1795 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1800} 2058}
1801 2059
1802sub normalise { 2060sub normalise {
1803 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1804 2062
1805 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1806 2064
1807 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1808 2066
1809 # map plan: 2067 # map plan:
1810 # 2068 #
1825 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 2084 $path = "$base/$path";
1827 } 2085 }
1828 2086
1829 for ($path) { 2087 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1833 } 2090 }
1834 2091
1835 $path 2092 $path
1849 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1850 return $self; 2107 return $self;
1851 } 2108 }
1852 } 2109 }
1853 2110
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2112 ()
1856} 2113}
1857 2114
2115# may re-bless or do other evil things
1858sub init { 2116sub init {
1859 my ($self) = @_; 2117 my ($self) = @_;
1860 2118
1861 $self 2119 $self
1862} 2120}
1927 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1928 2186
1929 1 2187 1
1930} 2188}
1931 2189
2190# used to laod the header of an original map
1932sub load_header_orig { 2191sub load_header_orig {
1933 my ($self) = @_; 2192 my ($self) = @_;
1934 2193
1935 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1936} 2195}
1937 2196
2197# used to laod the header of an instantiated map
1938sub load_header_temp { 2198sub load_header_temp {
1939 my ($self) = @_; 2199 my ($self) = @_;
1940 2200
1941 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1942} 2202}
1943 2203
2204# called after loading the header from an instantiated map
1944sub prepare_temp { 2205sub prepare_temp {
1945 my ($self) = @_; 2206 my ($self) = @_;
1946 2207
1947 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1949 # safety 2210 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2213}
1953 2214
2215# called after loading the header from an original map
1954sub prepare_orig { 2216sub prepare_orig {
1955 my ($self) = @_; 2217 my ($self) = @_;
1956 2218
1957 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1982 2244
1983sub find; 2245sub find;
1984sub find { 2246sub find {
1985 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1986 2248
2249 cf::cede_to_tick;
2250
1987 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1988 2252
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2255
1992 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2023 2287
2024 { 2288 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2026 2290
2027 return unless $self->valid; 2291 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2293
2032 $self->alloc; 2294 $self->alloc;
2033 2295
2034 $self->pre_load; 2296 $self->pre_load;
2035 cf::cede_to_tick; 2297 cf::cede_to_tick;
2036 2298
2299 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2301 $f->skip_block;
2039 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2040 or return; 2303 or return;
2041 2304
2042 $self->post_load_original 2305 $self->post_load_original
2043 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2044 2307
2045 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2309 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2312 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2052 } 2316 }
2053 } 2317 }
2054 }
2055 2318
2056 $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);
2057 2326
2058 cf::cede_to_tick; 2327 cf::cede_to_tick;
2059 # now do the right thing for maps 2328 # now do the right thing for maps
2060 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2335 $self->decay_objects;
2067 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2068 $self->update_buttons; 2337 $self->update_buttons;
2069 cf::cede_to_tick; 2338 cf::cede_to_tick;
2070 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2071 } 2340 }
2072 2341
2073 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2344 }
2078 2345
2079 $self->post_load; 2346 $self->post_load;
2080}
2081 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
2082sub customise_for { 2354sub customise_for {
2083 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2084 2356
2085 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2358 if $self->per_player;
2089# if $self->per_party; 2361# if $self->per_party;
2090 2362
2091 $self 2363 $self
2092} 2364}
2093 2365
2094# find and load all maps in the 3x3 area around a map
2095sub load_neighbours {
2096 my ($map) = @_;
2097
2098 my @neigh; # diagonal neighbours
2099
2100 for (0 .. 3) {
2101 my $neigh = $map->tile_path ($_)
2102 or next;
2103 $neigh = find $neigh, $map
2104 or next;
2105 $neigh->load;
2106
2107 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 }
2111
2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
2114 my $neigh = find $path, $origin
2115 or next;
2116 $neigh->load;
2117 }
2118}
2119
2120sub find_sync { 2366sub find_sync {
2121 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2122 2368
2123 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
2124} 2374}
2125 2375
2126sub do_load_sync { 2376sub do_load_sync {
2127 my ($map) = @_; 2377 my ($map) = @_;
2128 2378
2379 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2131 2382
2132 cf::sync_job { $map->load }; 2383 $map->load;
2133} 2384}
2134 2385
2135our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2137 2388
2138sub find_async { 2389sub find_async {
2139 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2140 2391
2141 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2142 2393
2143 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2145 } 2396 }
2146 2397
2147 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2148 2399
2149 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2151 2402
2152 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2153 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2154 if (my $map = find $k) { 2405 if (my $map = find $k) {
2155 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2156 } 2407 }
2157 2408
2158 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2159 } 2410 }
2160 } 2411 }
2163 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2164 2415
2165 () 2416 ()
2166} 2417}
2167 2418
2419# common code, used by both ->save and ->swapout
2168sub save { 2420sub _save {
2169 my ($self) = @_; 2421 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2422
2173 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2174 2424
2175 return unless $self->dirty; 2425 return unless $self->dirty;
2176 2426
2196 } else { 2446 } else {
2197 $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);
2198 } 2448 }
2199} 2449}
2200 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2201sub swap_out { 2459sub swap_out {
2202 my ($self) = @_; 2460 my ($self) = @_;
2203 2461
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2209 return if $self->players; 2466 return if $self->players;
2210 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
2211 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2212 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
2213 $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};
2214 2518
2215 $self->deactivate; 2519 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2521 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2522
2263 $self->unlink_save; 2523 $self->unlink_save;
2264 $self->destroy; 2524 $self->destroy;
2265} 2525}
2266 2526
2274 2534
2275 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2276 2536
2277 $self->unlink_save; 2537 $self->unlink_save;
2278 2538
2279 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2544
2405 2665
2406Creates 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.
2407 2667
2408=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2409 2669
2410returns 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,
2411even if the object actually exists. May block. 2671even if the object actually exists. May block.
2412 2672
2413=cut 2673=cut
2414 2674
2415sub deref { 2675sub deref {
2497=item $player_object->may ("access") 2757=item $player_object->may ("access")
2498 2758
2499Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2500(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2501 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
2502=cut 2787=cut
2503 2788
2504sub cf::object::player::may { 2789sub cf::object::player::may {
2505 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2506 2791
2507 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2508 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2509 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2510 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2511} 2796}
2512 2797
2513=item $player_object->enter_link 2798=item $player_object->enter_link
2514 2799
2515Freezes 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}>).
2516 2801
2517The 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.
2518for 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,
2519though, 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
2520map. 2805map.
2521 2806
2522Will 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.
2523 2814
2524=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2525 2816
2526Moves 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
2527map. 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
2545sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2546 my ($self) = @_; 2837 my ($self) = @_;
2547 2838
2548 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2549 2840
2841 ++$self->{_link_recursion};
2842
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2844
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2554 2847
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2849}
2557 2850
2558sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2560 2853
2580 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2583 2876
2584 $map->load; 2877 $map->load;
2585 $map->load_neighbours;
2586 2878
2587 return unless $self->contr->active; 2879 return unless $self->contr->active;
2588 2880
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2591 2883 # entering was successful
2884 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2885 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2886 $self->activate_recursive;
2594} 2887 }
2595 2888
2889}
2890
2596=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)]])
2597 2892
2598Moves 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
2599her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2600that 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
2601the 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
2608 2903
2609our $GOTOGEN; 2904our $GOTOGEN;
2610 2905
2611sub cf::object::player::goto { 2906sub cf::object::player::goto {
2612 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 }
2613 2914
2614 # 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
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2917
2617 $self->enter_link; 2918 $self->enter_link;
2637 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2638 } 2939 }
2639 } 2940 }
2640 2941
2641 my $map = eval { 2942 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643 2944
2644 if ($map) { 2945 if ($map) {
2645 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2948 } else {
2648 $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);
2649 } 2950 }
2650 2951
2651 $map 2952 $map
2659 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2662 } 2963 }
2663 2964
2664 $done->() if $done; 2965 $done->($self) if $done;
2665 })->prio (1); 2966 })->prio (1);
2666} 2967}
2667 2968
2668=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2669 2970
2737 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2738 3039
2739 unless (eval { 3040 unless (eval {
2740 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2741 3042
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2751 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2752 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 }
2753 3069
2754 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2755 3071
2756 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2762 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "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. "
2764 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2766 3082
2767 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 3084 $self->leave_link;
2769 } 3085 }
2770 })->prio (1); 3086 })->prio (1);
2771} 3087}
2772 3088
2773=head3 cf::client 3089=head3 cf::client
2774 3090
2775=over 4 3091=over 4
2776
2777=item $client->send_drawinfo ($text, $flags)
2778
2779Sends a drawinfo packet to the client. Circumvents output buffering so
2780should not be used under normal circumstances.
2781
2782=cut
2783
2784sub cf::client::send_drawinfo {
2785 my ($self, $text, $flags) = @_;
2786
2787 utf8::encode $text;
2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790 3092
2791=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2792 3094
2793Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required. 3096them as required.
2813 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2814} 3116}
2815 3117
2816=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2817 3119
2818Send 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
2819client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2820the 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
2821the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2822 3124
2823=cut 3125=cut
2824 3126
2825# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2868 }, 3170 },
2869 "c/body" => { 3171 "c/body" => {
2870 id => "infobox", 3172 id => "infobox",
2871 title => "Body Parts", 3173 title => "Body Parts",
2872 reply => undef, 3174 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
2874 }, 3176 },
2875 "c/statistics" => { 3177 "c/statistics" => {
2876 id => "infobox", 3178 id => "infobox",
2877 title => "Statistics", 3179 title => "Statistics",
2878 reply => undef, 3180 reply => undef,
2930 id => "death", 3232 id => "death",
2931 title => "Death", 3233 title => "Death",
2932 reply => undef, 3234 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2934 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2935 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2937); 3245);
2938 3246
2939sub cf::client::send_msg { 3247sub cf::client::send_msg {
2982=cut 3290=cut
2983 3291
2984sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2985 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2986 3294
2987 if ($self->extcmd == 2) {
2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2989 } elsif ($self->extcmd == 1) { # TODO: remove
2990 push @msg, msgtype => "event_$type";
2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992 }
2993}
2994
2995=item $client->ext_reply ($msgid, @msg)
2996
2997Sends an ext reply to the client.
2998
2999=cut
3000
3001sub cf::client::ext_reply($$@) {
3002 my ($self, $id, @msg) = @_;
3003
3004 if ($self->extcmd == 2) {
3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006 } elsif ($self->extcmd == 1) {
3007 #TODO: version 1, remove
3008 unshift @msg, msgtype => "reply", msgid => $id;
3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3010 }
3011} 3296}
3012 3297
3013=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3014 3299
3015Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3035 3320
3036 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3037 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3038 3323
3039 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;
3040} 3364}
3041 3365
3042cf::client->attach ( 3366cf::client->attach (
3043 on_connect => sub { 3367 on_connect => sub {
3044 my ($ns) = @_; 3368 my ($ns) = @_;
3070 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3071 3395
3072 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3073 3397
3074 if (ref $msg) { 3398 if (ref $msg) {
3075 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3076 "ARRAY" eq ref $msg
3077 ? @$msg
3078 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3079 3400
3080 my @reply;
3081
3082 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}) {
3083 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3084 } 3419 }
3085
3086 $ns->ext_reply ($reply, @reply)
3087 if $reply;
3088
3089 } else { 3420 } else {
3090 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";
3091 } 3422 }
3092 3423
3093 cf::override; 3424 cf::override;
3094 }, 3425 },
3095); 3426);
3115 3446
3116 $coro 3447 $coro
3117} 3448}
3118 3449
3119cf::client->attach ( 3450cf::client->attach (
3120 on_destroy => sub { 3451 on_client_destroy => sub {
3121 my ($ns) = @_; 3452 my ($ns) = @_;
3122 3453
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3455 },
3125); 3456);
3176 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3180) { 3511) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3514 for @funs;
3185} 3515}
3186 3516
3225 local @cf::_safe_eval_args = values %vars; 3555 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3556 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3557 }
3228 3558
3229 if ($@) { 3559 if ($@) {
3230 warn "$@"; 3560 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3233 } 3563 }
3234 3564
3235 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3236} 3566}
3237 3567
3262=cut 3592=cut
3263 3593
3264############################################################################# 3594#############################################################################
3265# the server's init and main functions 3595# the server's init and main functions
3266 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
3267sub load_facedata($) { 3674sub load_facedata($) {
3268 my ($path) = @_; 3675 my ($path) = @_;
3269 3676
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3678
3276 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3277 3680
3278 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3279 0 < aio_load $path, $facedata
3280 or die "$path: $!";
3281
3282 $facedata = Coro::Storable::thaw $facedata;
3283 3682
3284 $facedata->{version} == 2 3683 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3286 3685
3287 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3289 $facedata->{resource}{"res/exp_table"} = { 3688
3290 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3291 data => $exp_table, 3690
3292 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3293 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3294 cf::cede_to_tick; 3693 my $t1 = EV::time;
3295 3694
3296 { 3695 {
3297 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3298 3697
3299 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3300 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3301 3701
3302 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3303 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3306 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3307 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3308 } 3709 }
3309 3710
3310 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3311 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3312 3713
3315 3716
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3720 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3722 }
3322
3323 cf::cede_to_tick;
3324 } 3723 }
3325 } 3724 }
3326 3725
3327 { 3726 {
3328 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3329 3728
3330 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3331 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3332 cf::cede_to_tick;
3333 } 3731 }
3334 3732
3335 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3336 } 3734 }
3337 3735
3338 { 3736 {
3339 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3340 3738
3341 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3342 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
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3743
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 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;
3347 } else { 3750 } else {
3348 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3349 } 3752 }
3350
3351 cf::cede_to_tick;
3352 } 3753 }
3353 } 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;
3354 3765
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3357 1 3770 1
3358} 3771}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3772
3380register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3382 3775
3383 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3391 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3393 cf::arch::commit_load; 3786 cf::arch::commit_load;
3394 3787
3395 $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;
3396} 3803}
3397 3804
3398sub reload_regions { 3805sub reload_regions {
3399 # 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
3400 # for this (global event?) 3807 # for this (global event?)
3408 if exists $_->{match}; 3815 if exists $_->{match};
3409 } 3816 }
3410} 3817}
3411 3818
3412sub reload_facedata { 3819sub reload_facedata {
3413 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3414 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3415} 3822}
3416 3823
3417sub reload_archetypes { 3824sub reload_archetypes {
3418 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3419 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;
3420} 3853}
3421 3854
3422sub reload_treasures { 3855sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3425} 3858}
3426 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
3427sub reload_resources { 3880sub reload_resources {
3428 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3429 3882
3883 reload_materials;
3430 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3431 reload_archetypes; 3887 reload_archetypes;
3432 reload_regions; 3888 reload_regions;
3433 reload_treasures; 3889 reload_treasures;
3434 3890
3435 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3436} 3892}
3437 3893
3438sub reload_config { 3894sub reload_config {
3439 warn "reloading config file...\n"; 3895 trace "reloading config file...\n";
3440 3896
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3897 my $config = load_file "$CONFDIR/config";
3442 or return; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3443 3900
3444 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>;
3446
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3902
3449 $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};
3450 $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};
3451 3905
3452 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3908 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3909 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3910 };
3457 warn $@ if $@; 3911 warn $@ if $@;
3458 } 3912 }
3459
3460 warn "finished reloading resource files\n";
3461} 3913}
3462 3914
3463sub pidfile() { 3915sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3917 or die "$PIDFILE: $!";
3478 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3479 print $fh $$; 3931 print $fh $$;
3480} 3932}
3481 3933
3482sub main_loop { 3934sub main_loop {
3483 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3484 if (1) { 3936 if (1) {
3485 EV::loop; 3937 EV::run;
3486 } 3938 }
3487 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3489} 3941}
3490 3942
3491sub main { 3943sub main {
3492 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3493 3945
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 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.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498 3950
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $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
3505 3952
3506 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3508 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#
3509 (async { 3956 (async {
3510 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3511 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3512 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3513 }; 3960 };
3514 3961
3515 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3516 3963
3517 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
3518 cf::load_settings; 3973 cf::load_settings;
3519 cf::load_materials;
3520 3974
3521 reload_resources; 3975 reload_resources;
3522 reload_config; 3976 reload_config;
3523 db_init;
3524 3977
3525 cf::init_uuid; 3978 cf::init_uuid;
3526 cf::init_signals; 3979 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3980 cf::init_skills;
3529 3981
3530 cf::init_beforeplay; 3982 cf::init_beforeplay;
3531 3983
3532 atomic; 3984 atomic;
3537 3989
3538 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX (); 3991 use POSIX ();
3540 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};
3541 3993
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3543 }; 3995 };
3544 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
3545 main_loop; 4004 goto &main_loop;
3546} 4005}
3547 4006
3548############################################################################# 4007#############################################################################
3549# initialisation and cleanup 4008# initialisation and cleanup
3550 4009
3551# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3552BEGIN { 4011BEGIN {
3553 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3557 }; 4016 };
3558 } 4017 }
3559} 4018}
3560 4019
3561sub write_runtime_sync { 4020sub write_runtime_sync {
4021 my $t0 = AE::time;
4022
3562 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3564 4025
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 4027
3567 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3568 4029
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 4031 or return;
3571 4032
3572 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3587 or return; 4048 or return;
3588 4049
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 4051 and return;
3591 4052
3592 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 4054
3594 1 4055 1
3595} 4056}
3596 4057
3597our $uuid_lock; 4058our $uuid_lock;
3609 or return; 4070 or return;
3610 4071
3611 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3612 4073
3613 unless ($value) { 4074 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3615 return; 4076 return;
3616 } 4077 }
3617 4078
3618 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 4080 $uuid_skip = 0;
3629 or return; 4090 or return;
3630 4091
3631 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3632 and return; 4093 and return;
3633 4094
3634 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3635 4096
3636 1 4097 1
3637 4098
3638} 4099}
3639 4100
3645} 4106}
3646 4107
3647sub emergency_save() { 4108sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3649 4110
3650 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;
3651 4117
3652 cf::sync_job { 4118 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 4120
3658 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 4127 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 4129 $pl->save;
3667 } 4130 }
3668 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3669 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3670 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 4138 $map->valid or next;
3674 $map->save; 4139 $map->save;
3675 } 4140 }
3676 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3677 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3678 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3681 4148
3682 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 4150 write_uuid_sync 1;
3684 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
3685 }; 4171 };
3686 4172
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3693} 4174}
3694 4175
3695sub post_cleanup { 4176sub post_cleanup {
3696 my ($make_core) = @_; 4177 my ($make_core) = @_;
3697 4178
4179 IO::AIO::flush;
4180
3698 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 4182 if $make_core;
3700 4183
3701 my $fh = pidfile; 4184 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3703} 4186}
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 4210 }
3728 warn "cleared package $pkg\n";#d#
3729} 4211}
3730 4212
3731sub do_reload_perl() { 4213sub do_reload_perl() {
3732 # can/must only be called in main 4214 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3734 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3735 return; 4217 return;
3736 } 4218 }
3737 4219
3738 return if $RELOAD++; 4220 return if $RELOAD++;
3739 4221
3740 my $t1 = EV::time; 4222 my $t1 = AE::time;
3741 4223
3742 while ($RELOAD) { 4224 while ($RELOAD) {
3743 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3744 4227
3745 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3746 4229
3747 cf::sync_job { 4230 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 4231 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 4232
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 4235 %EXT_CORO = ();
3765 4236
3766 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3767 %COMMAND = (); 4238 %COMMAND = ();
3768 4239
3769 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3770 %EXTCMD = (); 4241 %EXTCMD = ();
3771 %EXTICMD = (); 4242 %EXTICMD = ();
3772 4243
3773 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3776 4247
3777 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3778 eval { 4249 eval {
3779 $cb->($pkg); 4250 $cb->($pkg);
3780 1 4251 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3782 } 4253 }
3783 4254
3784 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3785 clear_package $pkg; 4256 clear_package $pkg;
3786 } 4257 }
3787 4258
3788 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 4262
3792 warn "... unloading $k"; 4263 trace "... unloading $k";
3793 delete $INC{$k}; 4264 delete $INC{$k};
3794 4265
3795 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3797 4268
3800 } 4271 }
3801 4272
3802 clear_package $k; 4273 clear_package $k;
3803 } 4274 }
3804 4275
3805 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 4277 clear_package "safe::$_"
3807 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);
3808 4279
3809 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 4283
3813 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3814 # and global variables created in xs 4285 # and global variables created in xs
3815 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3816 4287
3817 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3818 4289
3819 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3820 require cf; 4291 require cf;
3821 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3822 4293
3823 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3824 cf::reload_config; 4295 cf::reload_config;
3825 4296
3826 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3827 cf::load_extensions; 4298 cf::load_extensions;
3828 4299
3829 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3833 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3836 } 4307 }
3837 4308
3838 warn "running post_init jobs"; 4309 cf::_post_init 1;
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840 4310
3841 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3842 4312
3843 1 4313 1
3844 } or do { 4314 } or do {
3845 warn $@; 4315 error $@;
3846 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3847 }; 4317 };
3848 4318
3849 warn "reloaded";
3850 --$RELOAD; 4319 --$RELOAD;
3851 } 4320 }
3852 4321
3853 $t1 = EV::time - $t1; 4322 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3855}; 4324};
3856 4325
3857our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3858 4327
3859sub reload_perl() { 4328sub reload_perl() {
3861 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3862 4331
3863 $RELOAD_WATCHER ||= cf::async { 4332 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 4333 Coro::AIO::aio_wait cache_extensions;
3865 4334
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 4336 do_reload_perl;
3868 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3869 }; 4338 };
3870 }; 4339 };
3871} 4340}
3880 reload_perl; 4349 reload_perl;
3881 }; 4350 };
3882 } 4351 }
3883}; 4352};
3884 4353
3885unshift @INC, $LIBDIR; 4354#############################################################################
3886 4355
3887my $bug_warning = 0; 4356my $bug_warning = 0;
3888 4357
3889our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN;
3891
3892sub wait_for_tick { 4358sub wait_for_tick() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3894 4360
3895 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3896 push @WAIT_FOR_TICK, $signal;
3897 $signal->wait;
3898} 4362}
3899 4363
3900sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4366
3903 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3905 $signal->wait; 4369 $signal->wait;
3906} 4370}
3910 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"
3911 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3912 return; 4376 return;
3913 } 4377 }
3914 4378
3915 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#
3916 4382
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $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.;
3919 Coro::async_pool { 4385 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4387 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3923 }; 4389 };
3924 } 4390 }
3925 4391
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4393 $sig->send;
3928 } 4394 }
3929 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3930 $sig->send;
3931 }
3932 4396
3933 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3935 4399
3936 if (0) { 4400 if (0) {
3937 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3941 } 4405 }
3942 } 4406 }
3943} 4407}
3944 4408
3945{ 4409{
3946 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3947 4412
3948 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3951 4416
3952 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3955 $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;
3980 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3981 }; 4446 };
3982 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3983 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3984 }; 4449 };
4450
4451 info "database initialised";
3985} 4452}
3986 4453
3987{ 4454{
3988 # configure IO::AIO 4455 # configure IO::AIO
3989 4456
4457 info "initialising aio";
3990 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3991 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3992 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3993} 4462}
3994 4463
3995my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3996 4466
3997sub _log_backtrace { 4467sub _log_backtrace {
3998 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3999 4469
4000 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
4001 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4002 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
4003 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
4004 ++$_log_backtrace; 4478 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
4006 async { 4480 async {
4007 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4008 4482
4028 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4029 --$_log_backtrace; 4503 --$_log_backtrace;
4030 }; 4504 };
4031 } else { 4505 } else {
4032 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4033 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4034 } 4508 }
4035} 4509}
4036 4510
4037# load additional modules 4511# load additional modules
4038require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines