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.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines