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.510 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines