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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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
112 120
113our $OUTPUT_RATE_MIN = 4000; 121our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
115 126
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 129our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
121our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 135our $DB_ENV;
125 136
126our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 138
128our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 141
130our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
132our $NOW; 145our $NOW;
133 146
134our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
145 158
146our @POST_INIT; 159our @POST_INIT;
147 160
148our $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)
149our $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;
150 166
151binmode STDOUT; 167binmode STDOUT;
152binmode STDERR; 168binmode STDERR;
153 169
154# read virtual server time, if available 170# read virtual server time, if available
165 181
166our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
167 183
168sub cf::map::normalise; 184sub cf::map::normalise;
169 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
170############################################################################# 190#############################################################################
171 191
172%REFLECT = (); 192%REFLECT = ();
173for (@REFLECT) { 193for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 194 my $reflect = JSON::XS::decode_json $_;
184 204
185=over 4 205=over 4
186 206
187=item $cf::UPTIME 207=item $cf::UPTIME
188 208
189The 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.
190 225
191=item $cf::RUNTIME 226=item $cf::RUNTIME
192 227
193The 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
194every server tick. 229every server tick.
195 230
196=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199 234
200Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
203database environment. 238database environment.
204 239
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 240=item $cf::LOADAVG
214 241
215The 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
216(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
217objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
225Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
226from wherever your confdir points to. 253from wherever your confdir points to.
227 254
228=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
229 256
230These 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.
231returns 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
232per 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();
233 278
234=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
235 280
236This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
237C<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
245 290
246=back 291=back
247 292
248=cut 293=cut
249 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
250$Coro::State::WARNHOOK = sub { 301$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 302 my $msg = join "", @_;
252 303
253 $msg .= "\n" 304 $msg .= "\n"
254 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
255 306
256 $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;
257 308
258 LOG llevError, $msg; 309 LOG llevWarn, $msg;
259}; 310};
260 311
261$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
263 314
264 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
265 316
266 if ($Coro::current == $Coro::main) {#d# 317 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 319 return;#d#
269 }#d# 320 }#d#
270 321
271 # kill coroutine otherwise 322 # kill coroutine otherwise
272 Coro::terminate 323 Coro::terminate
292)) { 343)) {
293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294} 345}
295 346
296$EV::DIED = sub { 347$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
298}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
299 355
300############################################################################# 356#############################################################################
301 357
302=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
303 359
324 $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;
325 $d 381 $d
326 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
327} 383}
328 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
329=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
330 438
331Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
332 440
333=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
339our $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
340 448
341sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
345 498
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
348 501
349The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 503is a reload or not.
351 504
352=cut 505=cut
353 506
354sub post_init(&) { 507sub post_init(&) {
355 push @POST_INIT, shift; 508 push @POST_INIT, shift;
356} 509}
357 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
358=item cf::lock_wait $string 528=item cf::lock_wait $string
359 529
360Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
361 531
362=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
363 533
364Wait 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
365a 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,
399} 569}
400 570
401=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
402 572
403Like 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
404get spread over timer. 574get spread over time.
405 575
406=cut 576=cut
407 577
408sub periodic($$) { 578sub periodic($$) {
409 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
413 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
414} 584}
415 585
416=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
417 587
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
419This 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
420of 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.
421 595
422The 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
423used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
424 598
425Useful for short background jobs. 599Useful for short background jobs.
437 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
438 my $busy; 612 my $busy;
439 613
440 while () { 614 while () {
441 next_job: 615 next_job:
616
617 Coro::cede;
442 618
443 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
444 620
445 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
446 if ($SLOT_QUEUE[$_][0] <= $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0; 623 $busy = 0;
448 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
449 $job->[2]->send; 625 $job->[2]->send;
450 Coro::cede;
451 goto next_job; 626 goto next_job;
452 } else { 627 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
454 } 629 }
455 } 630 }
456 631
457 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
459 push @cf::WAIT_FOR_TICK, $signal;
460 $signal->wait;
461 } else { 634 } else {
462 $busy = 0; 635 $busy = 0;
463 Coro::schedule; 636 Coro::schedule;
464 } 637 }
465 } 638 }
491BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
492 665
493=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
494 667
495The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
496is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
497partly 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
498acceptable. 671acceptable.
499 672
500If 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
501the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
505=cut 678=cut
506 679
507sub sync_job(&) { 680sub sync_job(&) {
508 my ($job) = @_; 681 my ($job) = @_;
509 682
510 if ($Coro::current == $Coro::main) { 683 if (in_main) {
511 my $time = AE::time; 684 my $time = AE::time;
512 685
513 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
515 688
516 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
517 690
518 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
519 692
520 my $busy = 1; 693 my $busy = 1;
521 my @res; 694 my @res;
522 695
523 (async { 696 (async {
524 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 698 @res = eval { $job->() };
526 warn $@ if $@; 699 error $@ if $@;
527 undef $busy; 700 undef $busy;
528 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
529 702
530 while ($busy) { 703 while ($busy) {
531 if (Coro::nready) { 704 if (Coro::nready) {
532 Coro::cede_notself; 705 Coro::cede_notself;
533 } else { 706 } else {
534 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
535 } 708 }
536 } 709 }
537 710
538 my $time = AE::time - $time; 711 my $time = AE::time - $time;
539 712
565 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
566 739
567 $coro 740 $coro
568} 741}
569 742
570=item fork_call { }, $args 743=item fork_call { }, @args
571 744
572Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 748never block itself or use any form of event handling.
576 749
577=cut 750=cut
578 751
752sub post_fork {
753 reset_signals;
754}
755
579sub fork_call(&@) { 756sub fork_call(&@) {
580 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
581 758
582 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious)
585
586 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
587 reset_signals; 760 cf::post_fork;
588 &$cb 761 &$cb
589 }, @args; 762 } @args;
590 763
591 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 )
592} 776}
593 777
594=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
595 779
596=cut 780=cut
633within each server. 817within each server.
634 818
635=cut 819=cut
636 820
637sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
638 my ($name) = @_; 825 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
640 827
641 eval { 828 eval {
642 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
652} 839}
653 840
654our $DB; 841our $DB;
655 842
656sub db_init { 843sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
659 };
660} 845}
661 846
662sub db_get($$) { 847sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
664 849
665 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
666 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
667 854
668 $! ? () 855 $! ? ()
669 : $data 856 : $data
670 }
671} 857}
672 858
673sub db_put($$$) { 859sub db_put($$$) {
674 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
703 889
704 my @data; 890 my @data;
705 my $md5; 891 my $md5;
706 892
707 for (0 .. $#$src) { 893 for (0 .. $#$src) {
708 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
709 or Carp::croak "$src->[$_]: $!";
710 } 895 }
711 896
712 # if processing is expensive, check 897 # if processing is expensive, check
713 # checksum first 898 # checksum first
714 if (1) { 899 if (1) {
727 912
728 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
729 } 914 }
730 } 915 }
731 916
732 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
733 my $data = $process->(\@data); 918 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
735 920
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 922
738 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
741 926
751 936
752=cut 937=cut
753 938
754sub datalog($@) { 939sub datalog($@) {
755 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 942}
758 943
759=back 944=back
760 945
761=cut 946=cut
956 1141
957 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1144
960 } elsif (ref $type) { 1145 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
962 1147
963 } else { 1148 } else {
964 shift @arg; 1149 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
966 } 1151 }
967 } 1152 }
968} 1153}
969 1154
970sub _object_attach { 1155sub _object_attach {
980 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
981 } 1166 }
982 1167
983 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
984 } else { 1169 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1171 }
987 1172
988 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
989} 1174}
990 1175
1049 1234
1050 for (@$callbacks) { 1235 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1052 1237
1053 if ($@) { 1238 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1240 override;
1057 } 1241 }
1058 1242
1059 return 1 if $override; 1243 return 1 if $override;
1060 } 1244 }
1139 for (@$attach) { 1323 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1142 } 1326 }
1143 } else { 1327 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1329 }
1146 } 1330 }
1147} 1331}
1148 1332
1149cf::attachable->attach ( 1333cf::attachable->attach (
1176 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1177 1361
1178 sync_job { 1362 sync_job {
1179 if (length $$rdata) { 1363 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1183 1368
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1372 if ($cf::USE_FSYNC) {
1209 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1210 1395
1211 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1398 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1215 } 1400 }
1216 } else { 1401 } else {
1217 aio_unlink $filename; 1402 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1219 } 1404 }
1243 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1429 $av = $st->{objs};
1245 } 1430 }
1246 1431
1247 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1250 1436
1251 ($data, $av) 1437 ($data, $av)
1252} 1438}
1253 1439
1254=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1258=cut 1444=cut
1259 1445
1260############################################################################# 1446#############################################################################
1261# command handling &c 1447# command handling &c
1262 1448
1263=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1264 1450
1265Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1266$name. 1452$name.
1267 1453
1268=cut 1454=cut
1274 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1275 1461
1276 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1277} 1463}
1278 1464
1279=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1280 1466
1281Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1282extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1283received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1284the 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
1285has logged in successfully. 1471has logged in successfully.
1286 1472
1287If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1288called.
1289 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
1290=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1291 1481
1292Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1293exticmd 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
1294are 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
1295is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1296log-in. 1486log-in.
1297 1487
1298If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1299called.
1300 1489
1301=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1302 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
1303sub register_extcmd { 1497sub register_extcmd($$) {
1304 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1305 1499
1306 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1307} 1501}
1308 1502
1309sub register_exticmd { 1503sub register_async_extcmd($$) {
1310 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1311 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1312 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1313} 1519}
1314 1520
1315use File::Glob (); 1521use File::Glob ();
1316 1522
1317cf::player->attach ( 1523cf::player->attach (
1331 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1332 1538
1333 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1334 1540
1335 if (ref $msg) { 1541 if (ref $msg) {
1336 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1337 "ARRAY" eq ref $msg
1338 ? @$msg
1339 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1340 1543
1341 my @reply;
1342
1343 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}) {
1344 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1345 } 1562 }
1346 1563
1347 $pl->ext_reply ($reply, @reply)
1348 if $reply;
1349
1350 } else { 1564 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1566 }
1353 1567
1354 cf::override; 1568 cf::override;
1355 }, 1569 },
1356); 1570);
1366 }; 1580 };
1367 1581
1368 $grp 1582 $grp
1369} 1583}
1370 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
1371sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1372 cf::sync_job { 1601 cf::sync_job {
1373 my %todo; 1602 my %todo;
1374 1603
1375 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1605 next unless -r $path;
1394 1623
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1626
1398 $ext{source} = 1627 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1401 . $source 1630 . $source
1402 . "\n};\n1"; 1631 . "\n};\n1";
1403 1632
1404 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1416 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1646 next ext
1418 unless exists $done{$_}; 1647 unless exists $done{$_};
1419 } 1648 }
1420 1649
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 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
1423 my $active = eval $v->{source}; 1661 my $active = eval $source;
1424 1662
1425 if (length $@) { 1663 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1427 1665
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 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};
1430 } else { 1671 } else {
1431 $done{$k} = delete $todo{$k}; 1672 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1673 push @EXTS, $v->{pkg};
1433 $progress = 1; 1674 $progress = 1;
1434 1675
1435 warn "$v->{base}: extension inactive.\n" 1676 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1677 unless $active;
1437 } 1678 }
1438 } 1679 }
1439 1680
1440 unless ($progress) { 1681 unless ($progress) {
1442 1683
1443 while (my ($k, $v) = each %todo) { 1684 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory}; 1686 if exists $v->{meta}{mandatory};
1446 } 1687 }
1688
1689 last;
1447 } 1690 }
1448 } 1691 }
1449 }; 1692 };
1450} 1693}
1451 1694
1609 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1610 1853
1611 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1612 $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
1613 1856
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1858 $pl->deactivate;
1859
1616 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;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1619 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1620 1865
1621 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1677 \@logins 1922 \@logins
1678} 1923}
1679 1924
1680=item $player->maps 1925=item $player->maps
1681 1926
1927=item cf::player::maps $login
1928
1682Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1683player. May block. 1930player. May block.
1684 1931
1685=cut 1932=cut
1686 1933
1707 1954
1708=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1709 1956
1710Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1711 1958
1712=item $player->ext_reply ($msgid, @msg)
1713
1714Sends an ext reply to the player.
1715
1716=cut
1717
1718sub ext_reply($$@) {
1719 my ($self, $id, @msg) = @_;
1720
1721 $self->ns->ext_reply ($id, @msg)
1722}
1723
1724=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1725 1960
1726Sends an ext event to the client. 1961Sends an ext event to the client.
1727 1962
1728=cut 1963=cut
1747 1982
1748=cut 1983=cut
1749 1984
1750sub find_by_path($) { 1985sub find_by_path($) {
1751 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1752 1989
1753 my ($match, $specificity); 1990 my ($match, $specificity);
1754 1991
1755 for my $region (list) { 1992 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1785sub generate_random_map { 2022sub generate_random_map {
1786 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1787 2024
1788 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
1789 2026
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 2028}
1805 2029
1806=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1807 2031
1808Register 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
1813 2037
1814sub register { 2038sub register {
1815 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 2040 my $pkg = caller;
1817 2041
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 2043
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 2045}
1823 2046
1824# also paths starting with '/' 2047# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 2049
1827sub thawer_merge { 2050sub thawer_merge {
1828 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1829 2052
1830 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1835} 2058}
1836 2059
1837sub normalise { 2060sub normalise {
1838 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1839 2062
1840 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1841 2064
1842 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1843 2066
1844 # map plan: 2067 # map plan:
1845 # 2068 #
1860 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 2084 $path = "$base/$path";
1862 } 2085 }
1863 2086
1864 for ($path) { 2087 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1868 } 2090 }
1869 2091
1870 $path 2092 $path
1884 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1885 return $self; 2107 return $self;
1886 } 2108 }
1887 } 2109 }
1888 2110
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 2112 ()
1891} 2113}
1892 2114
2115# may re-bless or do other evil things
1893sub init { 2116sub init {
1894 my ($self) = @_; 2117 my ($self) = @_;
1895 2118
1896 $self 2119 $self
1897} 2120}
1962 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1963 2186
1964 1 2187 1
1965} 2188}
1966 2189
2190# used to laod the header of an original map
1967sub load_header_orig { 2191sub load_header_orig {
1968 my ($self) = @_; 2192 my ($self) = @_;
1969 2193
1970 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1971} 2195}
1972 2196
2197# used to laod the header of an instantiated map
1973sub load_header_temp { 2198sub load_header_temp {
1974 my ($self) = @_; 2199 my ($self) = @_;
1975 2200
1976 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1977} 2202}
1978 2203
2204# called after loading the header from an instantiated map
1979sub prepare_temp { 2205sub prepare_temp {
1980 my ($self) = @_; 2206 my ($self) = @_;
1981 2207
1982 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1983 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1984 # safety 2210 # safety
1985 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1986 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1987} 2213}
1988 2214
2215# called after loading the header from an original map
1989sub prepare_orig { 2216sub prepare_orig {
1990 my ($self) = @_; 2217 my ($self) = @_;
1991 2218
1992 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1993 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2017 2244
2018sub find; 2245sub find;
2019sub find { 2246sub find {
2020 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2021 2248
2249 cf::cede_to_tick;
2250
2022 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2023 2252
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2026 2255
2027 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2058 2287
2059 { 2288 {
2060 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2061 2290
2062 return unless $self->valid; 2291 return unless $self->valid;
2063 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2064
2065 $self->in_memory (cf::MAP_LOADING);
2066 2293
2067 $self->alloc; 2294 $self->alloc;
2068 2295
2069 $self->pre_load; 2296 $self->pre_load;
2070 cf::cede_to_tick; 2297 cf::cede_to_tick;
2071 2298
2299 if (exists $self->{load_path}) {
2072 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2073 $f->skip_block; 2301 $f->skip_block;
2074 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2075 or return; 2303 or return;
2076 2304
2077 $self->post_load_original 2305 $self->post_load_original
2078 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2079 2307
2080 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2081 utf8::encode $uniq; 2309 utf8::encode $uniq;
2082 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2083 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2084 $self->clear_unique_items; 2312 $self->clear_unique_items;
2085 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2086 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2087 } 2316 }
2088 } 2317 }
2089 }
2090 2318
2091 $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);
2092 2326
2093 cf::cede_to_tick; 2327 cf::cede_to_tick;
2094 # now do the right thing for maps 2328 # now do the right thing for maps
2095 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2096 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2100 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2101 $self->decay_objects; 2335 $self->decay_objects;
2102 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2103 $self->update_buttons; 2337 $self->update_buttons;
2104 cf::cede_to_tick; 2338 cf::cede_to_tick;
2105 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2106 } 2340 }
2107 2341
2108 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2109 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2110
2111 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2344 }
2113 2345
2114 $self->post_load; 2346 $self->post_load;
2347
2348 1
2115} 2349}
2116 2350
2117# customize the map for a given player, i.e. 2351# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2352# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2353# maps to change the path to ~playername/mappath
2127# if $self->per_party; 2361# if $self->per_party;
2128 2362
2129 $self 2363 $self
2130} 2364}
2131 2365
2132# find and load all maps in the 3x3 area around a map
2133sub load_neighbours {
2134 my ($map) = @_;
2135
2136 my @neigh; # diagonal neighbours
2137
2138 for (0 .. 3) {
2139 my $neigh = $map->tile_path ($_)
2140 or next;
2141 $neigh = find $neigh, $map
2142 or next;
2143 $neigh->load;
2144
2145 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 }
2149
2150 for (grep defined $_->[0], @neigh) {
2151 my ($path, $origin) = @$_;
2152 my $neigh = find $path, $origin
2153 or next;
2154 $neigh->load;
2155 }
2156}
2157
2158sub find_sync { 2366sub find_sync {
2159 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2160 2368
2161 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
2162} 2374}
2163 2375
2164sub do_load_sync { 2376sub do_load_sync {
2165 my ($map) = @_; 2377 my ($map) = @_;
2166 2378
2379 # it's a bug to call this from the main context
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2169 2382
2170 cf::sync_job { $map->load }; 2383 $map->load;
2171} 2384}
2172 2385
2173our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2175 2388
2176sub find_async { 2389sub find_async {
2177 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2178 2391
2179 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2180 2393
2181 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2183 } 2396 }
2184 2397
2185 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2186 2399
2187 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2188 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2189 2402
2190 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2191 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2192 if (my $map = find $k) { 2405 if (my $map = find $k) {
2193 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2194 } 2407 }
2195 2408
2196 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2197 } 2410 }
2198 } 2411 }
2201 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2202 2415
2203 () 2416 ()
2204} 2417}
2205 2418
2419# common code, used by both ->save and ->swapout
2206sub save { 2420sub _save {
2207 my ($self) = @_; 2421 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2422
2211 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2212 2424
2213 return unless $self->dirty; 2425 return unless $self->dirty;
2214 2426
2234 } else { 2446 } else {
2235 $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);
2236 } 2448 }
2237} 2449}
2238 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2239sub swap_out { 2459sub swap_out {
2240 my ($self) = @_; 2460 my ($self) = @_;
2241 2461
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2247 return if $self->players; 2466 return if $self->players;
2248 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
2249 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2250 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
2251 $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};
2252 2518
2253 $self->deactivate; 2519 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2521 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2522
2301 $self->unlink_save; 2523 $self->unlink_save;
2302 $self->destroy; 2524 $self->destroy;
2303} 2525}
2304 2526
2312 2534
2313 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2314 2536
2315 $self->unlink_save; 2537 $self->unlink_save;
2316 2538
2317 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2544
2443 2665
2444Creates 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.
2445 2667
2446=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2447 2669
2448returns 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,
2449even if the object actually exists. May block. 2671even if the object actually exists. May block.
2450 2672
2451=cut 2673=cut
2452 2674
2453sub deref { 2675sub deref {
2535=item $player_object->may ("access") 2757=item $player_object->may ("access")
2536 2758
2537Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2538(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2539 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
2540=cut 2787=cut
2541 2788
2542sub cf::object::player::may { 2789sub cf::object::player::may {
2543 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2544 2791
2545 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2546 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2547 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2548 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2549} 2796}
2550 2797
2551=item $player_object->enter_link 2798=item $player_object->enter_link
2552 2799
2553Freezes 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}>).
2554 2801
2555The 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.
2556for 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,
2557though, 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
2558map. 2805map.
2559 2806
2560Will 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.
2561 2814
2562=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2563 2816
2564Moves 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
2565map. 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
2583sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2584 my ($self) = @_; 2837 my ($self) = @_;
2585 2838
2586 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2587 2840
2841 ++$self->{_link_recursion};
2842
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2844
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2592 2847
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2849}
2595 2850
2596sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2598 2853
2618 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2619 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2620 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2621 2876
2622 $map->load; 2877 $map->load;
2623 $map->load_neighbours;
2624 2878
2625 return unless $self->contr->active; 2879 return unless $self->contr->active;
2626 2880
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2629 2883 # entering was successful
2884 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2885 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2886 $self->activate_recursive;
2632} 2887 }
2633 2888
2889}
2890
2634=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)]])
2635 2892
2636Moves 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
2637her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2638that 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
2639the 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
2646 2903
2647our $GOTOGEN; 2904our $GOTOGEN;
2648 2905
2649sub cf::object::player::goto { 2906sub cf::object::player::goto {
2650 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 }
2651 2914
2652 # 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
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2917
2655 $self->enter_link; 2918 $self->enter_link;
2675 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2676 } 2939 }
2677 } 2940 }
2678 2941
2679 my $map = eval { 2942 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681 2944
2682 if ($map) { 2945 if ($map) {
2683 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2948 } else {
2686 $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);
2687 } 2950 }
2688 2951
2689 $map 2952 $map
2697 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2700 } 2963 }
2701 2964
2702 $done->() if $done; 2965 $done->($self) if $done;
2703 })->prio (1); 2966 })->prio (1);
2704} 2967}
2705 2968
2706=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2707 2970
2775 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2776 3039
2777 unless (eval { 3040 unless (eval {
2778 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2779 3042
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2789 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2790 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 }
2791 3069
2792 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2793 3071
2794 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2800 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "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. "
2802 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2804 3082
2805 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 3084 $self->leave_link;
2807 } 3085 }
2808 })->prio (1); 3086 })->prio (1);
2809} 3087}
2810 3088
2811=head3 cf::client 3089=head3 cf::client
2812 3090
2813=over 4 3091=over 4
2814
2815=item $client->send_drawinfo ($text, $flags)
2816
2817Sends a drawinfo packet to the client. Circumvents output buffering so
2818should not be used under normal circumstances.
2819
2820=cut
2821
2822sub cf::client::send_drawinfo {
2823 my ($self, $text, $flags) = @_;
2824
2825 utf8::encode $text;
2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828 3092
2829=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2830 3094
2831Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required. 3096them as required.
2851 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2852} 3116}
2853 3117
2854=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2855 3119
2856Send 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
2857client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2858the 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
2859the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2860 3124
2861=cut 3125=cut
2862 3126
2863# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2968 id => "death", 3232 id => "death",
2969 title => "Death", 3233 title => "Death",
2970 reply => undef, 3234 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2972 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2973 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2975); 3245);
2976 3246
2977sub cf::client::send_msg { 3247sub cf::client::send_msg {
3020=cut 3290=cut
3021 3291
3022sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3023 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3024 3294
3025 if ($self->extcmd == 2) {
3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3027 } elsif ($self->extcmd == 1) { # TODO: remove
3028 push @msg, msgtype => "event_$type";
3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3030 }
3031}
3032
3033=item $client->ext_reply ($msgid, @msg)
3034
3035Sends an ext reply to the client.
3036
3037=cut
3038
3039sub cf::client::ext_reply($$@) {
3040 my ($self, $id, @msg) = @_;
3041
3042 if ($self->extcmd == 2) {
3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3044 } elsif ($self->extcmd == 1) {
3045 #TODO: version 1, remove
3046 unshift @msg, msgtype => "reply", msgid => $id;
3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3048 }
3049} 3296}
3050 3297
3051=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3052 3299
3053Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3073 3320
3074 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3075 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3076 3323
3077 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;
3078} 3364}
3079 3365
3080cf::client->attach ( 3366cf::client->attach (
3081 on_connect => sub { 3367 on_connect => sub {
3082 my ($ns) = @_; 3368 my ($ns) = @_;
3108 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3109 3395
3110 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3111 3397
3112 if (ref $msg) { 3398 if (ref $msg) {
3113 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3114 "ARRAY" eq ref $msg
3115 ? @$msg
3116 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3117 3400
3118 my @reply;
3119
3120 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}) {
3121 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3122 } 3419 }
3123
3124 $ns->ext_reply ($reply, @reply)
3125 if $reply;
3126
3127 } else { 3420 } else {
3128 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";
3129 } 3422 }
3130 3423
3131 cf::override; 3424 cf::override;
3132 }, 3425 },
3133); 3426);
3214 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3218) { 3511) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3514 for @funs;
3223} 3515}
3224 3516
3263 local @cf::_safe_eval_args = values %vars; 3555 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3556 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3557 }
3266 3558
3267 if ($@) { 3559 if ($@) {
3268 warn "$@"; 3560 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3271 } 3563 }
3272 3564
3273 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3274} 3566}
3275 3567
3300=cut 3592=cut
3301 3593
3302############################################################################# 3594#############################################################################
3303# the server's init and main functions 3595# the server's init and main functions
3304 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
3305sub load_facedata($) { 3674sub load_facedata($) {
3306 my ($path) = @_; 3675 my ($path) = @_;
3307 3676
3308 # HACK to clear player env face cache, we need some signal framework
3309 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = ();
3311
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3678
3314 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3315 3680
3316 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3317 0 < aio_load $path, $facedata
3318 or die "$path: $!";
3319
3320 $facedata = Coro::Storable::thaw $facedata;
3321 3682
3322 $facedata->{version} == 2 3683 $facedata->{version} == 2
3323 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3324 3685
3325 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3327 $facedata->{resource}{"res/exp_table"} = { 3688
3328 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3329 data => $exp_table, 3690
3330 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3331 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3332 cf::cede_to_tick; 3693 my $t1 = EV::time;
3333 3694
3334 { 3695 {
3335 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3336 3697
3337 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3338 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339 3701
3340 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3342 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};
3343 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};
3344 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3345 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3346 } 3709 }
3347 3710
3348 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3349 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3350 3713
3353 3716
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3720 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3722 }
3360
3361 cf::cede_to_tick;
3362 } 3723 }
3363 } 3724 }
3364 3725
3365 { 3726 {
3366 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3367 3728
3368 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3369 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3370 cf::cede_to_tick;
3371 } 3731 }
3372 3732
3373 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3374 } 3734 }
3375 3735
3376 { 3736 {
3377 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3378 3738
3379 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3380 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
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3743
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 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;
3385 } else { 3750 } else {
3386 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3387 } 3752 }
3388
3389 cf::cede_to_tick;
3390 } 3753 }
3391 } 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;
3392 3765
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3395 1 3770 1
3396} 3771}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3772
3418register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3420 3775
3421 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3429 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3431 cf::arch::commit_load; 3786 cf::arch::commit_load;
3432 3787
3433 $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;
3434} 3803}
3435 3804
3436sub reload_regions { 3805sub reload_regions {
3437 # 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
3438 # for this (global event?) 3807 # for this (global event?)
3446 if exists $_->{match}; 3815 if exists $_->{match};
3447 } 3816 }
3448} 3817}
3449 3818
3450sub reload_facedata { 3819sub reload_facedata {
3451 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3452 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3453} 3822}
3454 3823
3455sub reload_archetypes { 3824sub reload_archetypes {
3456 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3457 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;
3458} 3853}
3459 3854
3460sub reload_treasures { 3855sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3463} 3858}
3464 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
3465sub reload_resources { 3880sub reload_resources {
3466 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3467 3882
3883 reload_materials;
3468 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3469 reload_archetypes; 3887 reload_archetypes;
3470 reload_regions; 3888 reload_regions;
3471 reload_treasures; 3889 reload_treasures;
3472 3890
3473 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3474} 3892}
3475 3893
3476sub reload_config { 3894sub reload_config {
3477 warn "reloading config file...\n"; 3895 trace "reloading config file...\n";
3478 3896
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3897 my $config = load_file "$CONFDIR/config";
3480 or return; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3481 3900
3482 local $/;
3483 *CFG = YAML::XS::Load scalar <$fh>;
3484
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3902
3487 $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};
3488 $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};
3489 3905
3490 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3908 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3909 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3910 };
3495 warn $@ if $@; 3911 warn $@ if $@;
3496 } 3912 }
3497
3498 warn "finished reloading resource files\n";
3499} 3913}
3500 3914
3501sub pidfile() { 3915sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3917 or die "$PIDFILE: $!";
3516 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3517 print $fh $$; 3931 print $fh $$;
3518} 3932}
3519 3933
3520sub main_loop { 3934sub main_loop {
3521 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3522 if (1) { 3936 if (1) {
3523 EV::loop; 3937 EV::run;
3524 } 3938 }
3525 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3527} 3941}
3528 3942
3529sub main { 3943sub main {
3530 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3531 3945
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 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.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536 3950
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $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
3543 3952
3544 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3546 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#
3547 (async { 3956 (async {
3548 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3549 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3550 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3551 }; 3960 };
3552 3961
3553 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3554 3963
3555 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
3556 cf::load_settings; 3973 cf::load_settings;
3557 cf::load_materials;
3558 3974
3559 reload_resources; 3975 reload_resources;
3560 reload_config; 3976 reload_config;
3561 db_init;
3562 3977
3563 cf::init_uuid; 3978 cf::init_uuid;
3564 cf::init_signals; 3979 cf::init_signals;
3565 cf::init_skills; 3980 cf::init_skills;
3566 3981
3574 3989
3575 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3991 use POSIX ();
3577 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};
3578 3993
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3580 }; 3995 };
3581 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
3582 main_loop; 4004 goto &main_loop;
3583} 4005}
3584 4006
3585############################################################################# 4007#############################################################################
3586# initialisation and cleanup 4008# initialisation and cleanup
3587 4009
3626 or return; 4048 or return;
3627 4049
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 4051 and return;
3630 4052
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 4054
3633 1 4055 1
3634} 4056}
3635 4057
3636our $uuid_lock; 4058our $uuid_lock;
3648 or return; 4070 or return;
3649 4071
3650 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3651 4073
3652 unless ($value) { 4074 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3654 return; 4076 return;
3655 } 4077 }
3656 4078
3657 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 4080 $uuid_skip = 0;
3668 or return; 4090 or return;
3669 4091
3670 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3671 and return; 4093 and return;
3672 4094
3673 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3674 4096
3675 1 4097 1
3676 4098
3677} 4099}
3678 4100
3684} 4106}
3685 4107
3686sub emergency_save() { 4108sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3688 4110
3689 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;
3690 4117
3691 cf::sync_job { 4118 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 4120
3697 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 4127 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 4129 $pl->save;
3706 } 4130 }
3707 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3708 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3709 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 4138 $map->valid or next;
3713 $map->save; 4139 $map->save;
3714 } 4140 }
3715 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3716 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3717 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3720 4148
3721 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 4150 write_uuid_sync 1;
3723 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
3724 }; 4171 };
3725 4172
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3732} 4174}
3733 4175
3734sub post_cleanup { 4176sub post_cleanup {
3735 my ($make_core) = @_; 4177 my ($make_core) = @_;
3736 4178
4179 IO::AIO::flush;
4180
3737 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 4182 if $make_core;
3739 4183
3740 my $fh = pidfile; 4184 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3742} 4186}
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 4210 }
3767 warn "cleared package $pkg\n";#d#
3768} 4211}
3769 4212
3770sub do_reload_perl() { 4213sub do_reload_perl() {
3771 # can/must only be called in main 4214 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3773 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3774 return; 4217 return;
3775 } 4218 }
3776 4219
3777 return if $RELOAD++; 4220 return if $RELOAD++;
3778 4221
3779 my $t1 = AE::time; 4222 my $t1 = AE::time;
3780 4223
3781 while ($RELOAD) { 4224 while ($RELOAD) {
3782 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3783 4227
3784 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3785 4229
3786 cf::sync_job { 4230 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 4231 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 4232
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 4235 %EXT_CORO = ();
3804 4236
3805 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3806 %COMMAND = (); 4238 %COMMAND = ();
3807 4239
3808 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 4241 %EXTCMD = ();
3810 %EXTICMD = (); 4242 %EXTICMD = ();
3811 4243
3812 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3815 4247
3816 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3817 eval { 4249 eval {
3818 $cb->($pkg); 4250 $cb->($pkg);
3819 1 4251 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3821 } 4253 }
3822 4254
3823 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3824 clear_package $pkg; 4256 clear_package $pkg;
3825 } 4257 }
3826 4258
3827 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 4262
3831 warn "... unloading $k"; 4263 trace "... unloading $k";
3832 delete $INC{$k}; 4264 delete $INC{$k};
3833 4265
3834 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3836 4268
3839 } 4271 }
3840 4272
3841 clear_package $k; 4273 clear_package $k;
3842 } 4274 }
3843 4275
3844 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 4277 clear_package "safe::$_"
3846 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);
3847 4279
3848 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 4283
3852 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3853 # and global variables created in xs 4285 # and global variables created in xs
3854 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3855 4287
3856 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3857 4289
3858 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3859 require cf; 4291 require cf;
3860 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3861 4293
3862 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 4295 cf::reload_config;
3864 4296
3865 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 4298 cf::load_extensions;
3867 4299
3868 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3875 } 4307 }
3876 4308
3877 warn "running post_init jobs"; 4309 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 4310
3880 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3881 4312
3882 1 4313 1
3883 } or do { 4314 } or do {
3884 warn $@; 4315 error $@;
3885 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3886 }; 4317 };
3887 4318
3888 warn "reloaded";
3889 --$RELOAD; 4319 --$RELOAD;
3890 } 4320 }
3891 4321
3892 $t1 = AE::time - $t1; 4322 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3894}; 4324};
3895 4325
3896our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3897 4327
3898sub reload_perl() { 4328sub reload_perl() {
3919 reload_perl; 4349 reload_perl;
3920 }; 4350 };
3921 } 4351 }
3922}; 4352};
3923 4353
3924unshift @INC, $LIBDIR; 4354#############################################################################
3925 4355
3926my $bug_warning = 0; 4356my $bug_warning = 0;
3927 4357
3928our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN;
3930
3931sub wait_for_tick { 4358sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3933 4360
3934 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3935 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait;
3937} 4362}
3938 4363
3939sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3941 4366
3942 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4369 $signal->wait;
3945} 4370}
3949 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"
3950 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3951 return; 4376 return;
3952 } 4377 }
3953 4378
3954 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
3955 4380
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3957 4382
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $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.;
3960 Coro::async_pool { 4385 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4387 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3964 }; 4389 };
3965 } 4390 }
3966 4391
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4393 $sig->send;
3969 } 4394 }
3970 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3971 $sig->send;
3972 }
3973 4396
3974 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3976 4399
3977 if (0) { 4400 if (0) {
3978 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3982 } 4405 }
3983 } 4406 }
3984} 4407}
3985 4408
3986{ 4409{
3987 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3988 4412
3989 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
3990 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3991 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3992 4416
3993 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3994 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996 $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;
4021 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4022 }; 4446 };
4023 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4024 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4025 }; 4449 };
4450
4451 info "database initialised";
4026} 4452}
4027 4453
4028{ 4454{
4029 # configure IO::AIO 4455 # configure IO::AIO
4030 4456
4457 info "initialising aio";
4031 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4034} 4462}
4035 4463
4036my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
4037 4466
4038sub _log_backtrace { 4467sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
4040 4469
4041 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
4042 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4478 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
4047 async { 4480 async {
4048 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4049 4482
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4503 --$_log_backtrace;
4071 }; 4504 };
4072 } else { 4505 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4508 }
4076} 4509}
4077 4510
4078# load additional modules 4511# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines