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.517 by root, Thu Apr 15 06:07:51 2010 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
62use CBOR::XS ();
60use IO::AIO (); 63use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 64use Compress::LZF;
63use Digest::MD5 (); 65use Digest::MD5 ();
64 66
65AnyEvent::detect; 67AnyEvent::detect;
66 68
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; 119#our %RESOURCE; # unused
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,
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]
592} 765}
593 766
594sub objinfo { 767sub objinfo {
644within each server. 817within each server.
645 818
646=cut 819=cut
647 820
648sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
649 my ($name) = @_; 825 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
651 827
652 eval { 828 eval {
653 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
663} 839}
664 840
665our $DB; 841our $DB;
666 842
667sub db_init { 843sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
670 };
671} 845}
672 846
673sub db_get($$) { 847sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
675 849
676 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
677 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
678 854
679 $! ? () 855 $! ? ()
680 : $data 856 : $data
681 }
682} 857}
683 858
684sub db_put($$$) { 859sub db_put($$$) {
685 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
714 889
715 my @data; 890 my @data;
716 my $md5; 891 my $md5;
717 892
718 for (0 .. $#$src) { 893 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 895 }
722 896
723 # if processing is expensive, check 897 # if processing is expensive, check
724 # checksum first 898 # checksum first
725 if (1) { 899 if (1) {
738 912
739 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
740 } 914 }
741 } 915 }
742 916
743 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
744 my $data = $process->(\@data); 918 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
746 920
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 922
749 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
752 926
762 936
763=cut 937=cut
764 938
765sub datalog($@) { 939sub datalog($@) {
766 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 942}
769 943
770=back 944=back
771 945
772=cut 946=cut
967 1141
968 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1144
971 } elsif (ref $type) { 1145 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
973 1147
974 } else { 1148 } else {
975 shift @arg; 1149 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
977 } 1151 }
978 } 1152 }
979} 1153}
980 1154
981sub _object_attach { 1155sub _object_attach {
991 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
992 } 1166 }
993 1167
994 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
995 } else { 1169 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1171 }
998 1172
999 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
1000} 1174}
1001 1175
1060 1234
1061 for (@$callbacks) { 1235 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1063 1237
1064 if ($@) { 1238 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1240 override;
1068 } 1241 }
1069 1242
1070 return 1 if $override; 1243 return 1 if $override;
1071 } 1244 }
1150 for (@$attach) { 1323 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1153 } 1326 }
1154 } else { 1327 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1329 }
1157 } 1330 }
1158} 1331}
1159 1332
1160cf::attachable->attach ( 1333cf::attachable->attach (
1187 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1188 1361
1189 sync_job { 1362 sync_job {
1190 if (length $$rdata) { 1363 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1194 1368
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1372 if ($cf::USE_FSYNC) {
1220 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1221 1395
1222 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1398 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1226 } 1400 }
1227 } else { 1401 } else {
1228 aio_unlink $filename; 1402 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1230 } 1404 }
1254 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1429 $av = $st->{objs};
1256 } 1430 }
1257 1431
1258 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1261 1436
1262 ($data, $av) 1437 ($data, $av)
1263} 1438}
1264 1439
1265=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1269=cut 1444=cut
1270 1445
1271############################################################################# 1446#############################################################################
1272# command handling &c 1447# command handling &c
1273 1448
1274=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1275 1450
1276Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1277$name. 1452$name.
1278 1453
1279=cut 1454=cut
1285 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1286 1461
1287 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1288} 1463}
1289 1464
1290=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1291 1466
1292Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1293extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1294received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1295the 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
1296has logged in successfully. 1471has logged in successfully.
1297 1472
1298If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1299called.
1300 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
1301=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1302 1481
1303Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1304exticmd 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
1305are 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
1306is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1307log-in. 1486log-in.
1308 1487
1309If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1310called.
1311 1489
1312=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1313 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
1314sub register_extcmd { 1497sub register_extcmd($$) {
1315 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1316 1499
1317 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1318} 1501}
1319 1502
1320sub register_exticmd { 1503sub register_async_extcmd($$) {
1321 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1322 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1323 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1324} 1519}
1325 1520
1326use File::Glob (); 1521use File::Glob ();
1327 1522
1328cf::player->attach ( 1523cf::player->attach (
1342 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1343 1538
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1540
1346 if (ref $msg) { 1541 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1543
1352 my @reply;
1353
1354 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}) {
1355 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1356 } 1562 }
1357 1563
1358 $pl->ext_reply ($reply, @reply)
1359 if $reply;
1360
1361 } else { 1564 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1566 }
1364 1567
1365 cf::override; 1568 cf::override;
1366 }, 1569 },
1367); 1570);
1377 }; 1580 };
1378 1581
1379 $grp 1582 $grp
1380} 1583}
1381 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
1382sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1383 cf::sync_job { 1601 cf::sync_job {
1384 my %todo; 1602 my %todo;
1385 1603
1386 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1605 next unless -r $path;
1405 1623
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1626
1409 $ext{source} = 1627 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1412 . $source 1630 . $source
1413 . "\n};\n1"; 1631 . "\n};\n1";
1414 1632
1415 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1427 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1646 next ext
1429 unless exists $done{$_}; 1647 unless exists $done{$_};
1430 } 1648 }
1431 1649
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 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
1434 my $active = eval $v->{source}; 1661 my $active = eval $source;
1435 1662
1436 if (length $@) { 1663 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1438 1665
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 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};
1441 } else { 1671 } else {
1442 $done{$k} = delete $todo{$k}; 1672 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1673 push @EXTS, $v->{pkg};
1444 $progress = 1; 1674 $progress = 1;
1445 1675
1446 warn "$v->{base}: extension inactive.\n" 1676 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1677 unless $active;
1448 } 1678 }
1449 } 1679 }
1450 1680
1451 unless ($progress) { 1681 unless ($progress) {
1453 1683
1454 while (my ($k, $v) = each %todo) { 1684 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1686 if exists $v->{meta}{mandatory};
1457 } 1687 }
1688
1689 last;
1458 } 1690 }
1459 } 1691 }
1460 }; 1692 };
1461} 1693}
1462 1694
1620 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1621 1853
1622 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1623 $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
1624 1856
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1858 $pl->deactivate;
1859
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1630 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1631 1865
1632 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1688 \@logins 1922 \@logins
1689} 1923}
1690 1924
1691=item $player->maps 1925=item $player->maps
1692 1926
1927=item cf::player::maps $login
1928
1693Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1694player. May block. 1930player. May block.
1695 1931
1696=cut 1932=cut
1697 1933
1718 1954
1719=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1720 1956
1721Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1722 1958
1723=item $player->ext_reply ($msgid, @msg)
1724
1725Sends an ext reply to the player.
1726
1727=cut
1728
1729sub ext_reply($$@) {
1730 my ($self, $id, @msg) = @_;
1731
1732 $self->ns->ext_reply ($id, @msg)
1733}
1734
1735=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1736 1960
1737Sends an ext event to the client. 1961Sends an ext event to the client.
1738 1962
1739=cut 1963=cut
1758 1982
1759=cut 1983=cut
1760 1984
1761sub find_by_path($) { 1985sub find_by_path($) {
1762 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1763 1989
1764 my ($match, $specificity); 1990 my ($match, $specificity);
1765 1991
1766 for my $region (list) { 1992 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1796sub generate_random_map { 2022sub generate_random_map {
1797 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1798 2024
1799 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
1800 2026
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 2028}
1816 2029
1817=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1818 2031
1819Register 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
1824 2037
1825sub register { 2038sub register {
1826 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 2040 my $pkg = caller;
1828 2041
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 2043
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 2045}
1834 2046
1835# also paths starting with '/' 2047# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 2049
1838sub thawer_merge { 2050sub thawer_merge {
1839 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1840 2052
1841 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1846} 2058}
1847 2059
1848sub normalise { 2060sub normalise {
1849 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1850 2062
1851 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1852 2064
1853 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1854 2066
1855 # map plan: 2067 # map plan:
1856 # 2068 #
1871 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 2084 $path = "$base/$path";
1873 } 2085 }
1874 2086
1875 for ($path) { 2087 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1879 } 2090 }
1880 2091
1881 $path 2092 $path
1895 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1896 return $self; 2107 return $self;
1897 } 2108 }
1898 } 2109 }
1899 2110
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 2112 ()
1902} 2113}
1903 2114
2115# may re-bless or do other evil things
1904sub init { 2116sub init {
1905 my ($self) = @_; 2117 my ($self) = @_;
1906 2118
1907 $self 2119 $self
1908} 2120}
1973 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1974 2186
1975 1 2187 1
1976} 2188}
1977 2189
2190# used to laod the header of an original map
1978sub load_header_orig { 2191sub load_header_orig {
1979 my ($self) = @_; 2192 my ($self) = @_;
1980 2193
1981 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1982} 2195}
1983 2196
2197# used to laod the header of an instantiated map
1984sub load_header_temp { 2198sub load_header_temp {
1985 my ($self) = @_; 2199 my ($self) = @_;
1986 2200
1987 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1988} 2202}
1989 2203
2204# called after loading the header from an instantiated map
1990sub prepare_temp { 2205sub prepare_temp {
1991 my ($self) = @_; 2206 my ($self) = @_;
1992 2207
1993 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1995 # safety 2210 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2213}
1999 2214
2215# called after loading the header from an original map
2000sub prepare_orig { 2216sub prepare_orig {
2001 my ($self) = @_; 2217 my ($self) = @_;
2002 2218
2003 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2028 2244
2029sub find; 2245sub find;
2030sub find { 2246sub find {
2031 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2032 2248
2249 cf::cede_to_tick;
2250
2033 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2034 2252
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2255
2038 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2069 2287
2070 { 2288 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2072 2290
2073 return unless $self->valid; 2291 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2293
2078 $self->alloc; 2294 $self->alloc;
2079 2295
2080 $self->pre_load; 2296 $self->pre_load;
2081 cf::cede_to_tick; 2297 cf::cede_to_tick;
2082 2298
2299 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2301 $f->skip_block;
2085 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2086 or return; 2303 or return;
2087 2304
2088 $self->post_load_original 2305 $self->post_load_original
2089 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2090 2307
2091 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2309 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2312 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2098 } 2316 }
2099 } 2317 }
2100 }
2101 2318
2102 $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);
2103 2326
2104 cf::cede_to_tick; 2327 cf::cede_to_tick;
2105 # now do the right thing for maps 2328 # now do the right thing for maps
2106 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2335 $self->decay_objects;
2113 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2114 $self->update_buttons; 2337 $self->update_buttons;
2115 cf::cede_to_tick; 2338 cf::cede_to_tick;
2116 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2117 } 2340 }
2118 2341
2119 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2344 }
2124 2345
2125 $self->post_load; 2346 $self->post_load;
2347
2348 1
2126} 2349}
2127 2350
2128# customize the map for a given player, i.e. 2351# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2352# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2353# maps to change the path to ~playername/mappath
2138# if $self->per_party; 2361# if $self->per_party;
2139 2362
2140 $self 2363 $self
2141} 2364}
2142 2365
2143# find and load all maps in the 3x3 area around a map
2144sub load_neighbours {
2145 my ($map) = @_;
2146
2147 my @neigh; # diagonal neighbours
2148
2149 for (0 .. 3) {
2150 my $neigh = $map->tile_path ($_)
2151 or next;
2152 $neigh = find $neigh, $map
2153 or next;
2154 $neigh->load;
2155
2156 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 }
2160
2161 for (grep defined $_->[0], @neigh) {
2162 my ($path, $origin) = @$_;
2163 my $neigh = find $path, $origin
2164 or next;
2165 $neigh->load;
2166 }
2167}
2168
2169sub find_sync { 2366sub find_sync {
2170 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2171 2368
2172 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
2173} 2374}
2174 2375
2175sub do_load_sync { 2376sub do_load_sync {
2176 my ($map) = @_; 2377 my ($map) = @_;
2177 2378
2379 # it's a bug to call this from the main context
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2180 2382
2181 cf::sync_job { $map->load }; 2383 $map->load;
2182} 2384}
2183 2385
2184our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2186 2388
2187sub find_async { 2389sub find_async {
2188 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2189 2391
2190 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2191 2393
2192 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2194 } 2396 }
2195 2397
2196 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2197 2399
2198 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2200 2402
2201 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2202 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2203 if (my $map = find $k) { 2405 if (my $map = find $k) {
2204 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2205 } 2407 }
2206 2408
2207 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2208 } 2410 }
2209 } 2411 }
2212 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2213 2415
2214 () 2416 ()
2215} 2417}
2216 2418
2419# common code, used by both ->save and ->swapout
2217sub save { 2420sub _save {
2218 my ($self) = @_; 2421 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2422
2222 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2223 2424
2224 return unless $self->dirty; 2425 return unless $self->dirty;
2225 2426
2245 } else { 2446 } else {
2246 $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);
2247 } 2448 }
2248} 2449}
2249 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2250sub swap_out { 2459sub swap_out {
2251 my ($self) = @_; 2460 my ($self) = @_;
2252 2461
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2258 return if $self->players; 2466 return if $self->players;
2259 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
2260 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2261 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
2262 $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};
2263 2518
2264 $self->deactivate; 2519 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2521 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2522
2312 $self->unlink_save; 2523 $self->unlink_save;
2313 $self->destroy; 2524 $self->destroy;
2314} 2525}
2315 2526
2323 2534
2324 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2325 2536
2326 $self->unlink_save; 2537 $self->unlink_save;
2327 2538
2328 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2544
2454 2665
2455Creates 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.
2456 2667
2457=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2458 2669
2459returns 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,
2460even if the object actually exists. May block. 2671even if the object actually exists. May block.
2461 2672
2462=cut 2673=cut
2463 2674
2464sub deref { 2675sub deref {
2546=item $player_object->may ("access") 2757=item $player_object->may ("access")
2547 2758
2548Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2549(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2550 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
2551=cut 2787=cut
2552 2788
2553sub cf::object::player::may { 2789sub cf::object::player::may {
2554 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2555 2791
2556 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2557 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2558 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2559 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2560} 2796}
2561 2797
2562=item $player_object->enter_link 2798=item $player_object->enter_link
2563 2799
2564Freezes 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}>).
2565 2801
2566The 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.
2567for 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,
2568though, 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
2569map. 2805map.
2570 2806
2571Will 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.
2572 2814
2573=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2574 2816
2575Moves 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
2576map. 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
2594sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2595 my ($self) = @_; 2837 my ($self) = @_;
2596 2838
2597 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2598 2840
2841 ++$self->{_link_recursion};
2842
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2844
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2603 2847
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2849}
2606 2850
2607sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2609 2853
2629 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2630 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2631 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2632 2876
2633 $map->load; 2877 $map->load;
2634 $map->load_neighbours;
2635 2878
2636 return unless $self->contr->active; 2879 return unless $self->contr->active;
2637 2880
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2640 2883 # entering was successful
2884 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2885 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2886 $self->activate_recursive;
2643} 2887 }
2644 2888
2889}
2890
2645=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)]])
2646 2892
2647Moves 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
2648her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2649that 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
2650the 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
2657 2903
2658our $GOTOGEN; 2904our $GOTOGEN;
2659 2905
2660sub cf::object::player::goto { 2906sub cf::object::player::goto {
2661 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 }
2662 2914
2663 # 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
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2917
2666 $self->enter_link; 2918 $self->enter_link;
2686 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2687 } 2939 }
2688 } 2940 }
2689 2941
2690 my $map = eval { 2942 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692 2944
2693 if ($map) { 2945 if ($map) {
2694 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2948 } else {
2697 $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);
2698 } 2950 }
2699 2951
2700 $map 2952 $map
2708 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2711 } 2963 }
2712 2964
2713 $done->() if $done; 2965 $done->($self) if $done;
2714 })->prio (1); 2966 })->prio (1);
2715} 2967}
2716 2968
2717=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2718 2970
2786 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2787 3039
2788 unless (eval { 3040 unless (eval {
2789 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2790 3042
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2800 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2801 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 }
2802 3069
2803 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2804 3071
2805 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2811 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "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. "
2813 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2815 3082
2816 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 3084 $self->leave_link;
2818 } 3085 }
2819 })->prio (1); 3086 })->prio (1);
2820} 3087}
2821 3088
2822=head3 cf::client 3089=head3 cf::client
2823 3090
2824=over 4 3091=over 4
2825
2826=item $client->send_drawinfo ($text, $flags)
2827
2828Sends a drawinfo packet to the client. Circumvents output buffering so
2829should not be used under normal circumstances.
2830
2831=cut
2832
2833sub cf::client::send_drawinfo {
2834 my ($self, $text, $flags) = @_;
2835
2836 utf8::encode $text;
2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839 3092
2840=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2841 3094
2842Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required. 3096them as required.
2862 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2863} 3116}
2864 3117
2865=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2866 3119
2867Send 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
2868client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2869the 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
2870the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2871 3124
2872=cut 3125=cut
2873 3126
2874# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2917 }, 3170 },
2918 "c/body" => { 3171 "c/body" => {
2919 id => "infobox", 3172 id => "infobox",
2920 title => "Body Parts", 3173 title => "Body Parts",
2921 reply => undef, 3174 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
2923 }, 3176 },
2924 "c/statistics" => { 3177 "c/statistics" => {
2925 id => "infobox", 3178 id => "infobox",
2926 title => "Statistics", 3179 title => "Statistics",
2927 reply => undef, 3180 reply => undef,
2979 id => "death", 3232 id => "death",
2980 title => "Death", 3233 title => "Death",
2981 reply => undef, 3234 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2983 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2984 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2986); 3245);
2987 3246
2988sub cf::client::send_msg { 3247sub cf::client::send_msg {
3031=cut 3290=cut
3032 3291
3033sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3034 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3035 3294
3036 if ($self->extcmd == 2) {
3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3038 } elsif ($self->extcmd == 1) { # TODO: remove
3039 push @msg, msgtype => "event_$type";
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3041 }
3042}
3043
3044=item $client->ext_reply ($msgid, @msg)
3045
3046Sends an ext reply to the client.
3047
3048=cut
3049
3050sub cf::client::ext_reply($$@) {
3051 my ($self, $id, @msg) = @_;
3052
3053 if ($self->extcmd == 2) {
3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3055 } elsif ($self->extcmd == 1) {
3056 #TODO: version 1, remove
3057 unshift @msg, msgtype => "reply", msgid => $id;
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3059 }
3060} 3296}
3061 3297
3062=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3063 3299
3064Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3084 3320
3085 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3086 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3087 3323
3088 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;
3089} 3364}
3090 3365
3091cf::client->attach ( 3366cf::client->attach (
3092 on_connect => sub { 3367 on_connect => sub {
3093 my ($ns) = @_; 3368 my ($ns) = @_;
3119 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3120 3395
3121 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3122 3397
3123 if (ref $msg) { 3398 if (ref $msg) {
3124 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3125 "ARRAY" eq ref $msg
3126 ? @$msg
3127 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3128 3400
3129 my @reply;
3130
3131 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}) {
3132 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3133 } 3419 }
3134
3135 $ns->ext_reply ($reply, @reply)
3136 if $reply;
3137
3138 } else { 3420 } else {
3139 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";
3140 } 3422 }
3141 3423
3142 cf::override; 3424 cf::override;
3143 }, 3425 },
3144); 3426);
3225 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3229) { 3511) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3514 for @funs;
3234} 3515}
3235 3516
3274 local @cf::_safe_eval_args = values %vars; 3555 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3556 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3557 }
3277 3558
3278 if ($@) { 3559 if ($@) {
3279 warn "$@"; 3560 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3282 } 3563 }
3283 3564
3284 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3285} 3566}
3286 3567
3311=cut 3592=cut
3312 3593
3313############################################################################# 3594#############################################################################
3314# the server's init and main functions 3595# the server's init and main functions
3315 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
3316sub load_facedata($) { 3674sub load_facedata($) {
3317 my ($path) = @_; 3675 my ($path) = @_;
3318 3676
3319 # HACK to clear player env face cache, we need some signal framework
3320 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = ();
3322
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3678
3325 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3326 3680
3327 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3328 0 < aio_load $path, $facedata
3329 or die "$path: $!";
3330
3331 $facedata = Coro::Storable::thaw $facedata;
3332 3682
3333 $facedata->{version} == 2 3683 $facedata->{version} == 2
3334 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3335 3685
3336 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3338 $facedata->{resource}{"res/exp_table"} = { 3688
3339 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3340 data => $exp_table, 3690
3341 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3342 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3343 cf::cede_to_tick; 3693 my $t1 = EV::time;
3344 3694
3345 { 3695 {
3346 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3347 3697
3348 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3349 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350 3701
3351 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3353 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};
3354 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};
3355 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3356 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3357 } 3709 }
3358 3710
3359 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3360 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3361 3713
3364 3716
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3720 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3722 }
3371
3372 cf::cede_to_tick;
3373 } 3723 }
3374 } 3724 }
3375 3725
3376 { 3726 {
3377 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3378 3728
3379 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3380 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3381 cf::cede_to_tick;
3382 } 3731 }
3383 3732
3384 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3385 } 3734 }
3386 3735
3387 { 3736 {
3388 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3389 3738
3390 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3391 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
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3743
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 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;
3396 } else { 3750 } else {
3397 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3398 } 3752 }
3399
3400 cf::cede_to_tick;
3401 } 3753 }
3402 } 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;
3403 3765
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3406 1 3770 1
3407} 3771}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3772
3429register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3431 3775
3432 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3440 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3442 cf::arch::commit_load; 3786 cf::arch::commit_load;
3443 3787
3444 $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;
3445} 3803}
3446 3804
3447sub reload_regions { 3805sub reload_regions {
3448 # 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
3449 # for this (global event?) 3807 # for this (global event?)
3457 if exists $_->{match}; 3815 if exists $_->{match};
3458 } 3816 }
3459} 3817}
3460 3818
3461sub reload_facedata { 3819sub reload_facedata {
3462 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3463 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3464} 3822}
3465 3823
3466sub reload_archetypes { 3824sub reload_archetypes {
3467 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3468 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;
3469} 3853}
3470 3854
3471sub reload_treasures { 3855sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3474} 3858}
3475 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
3476sub reload_resources { 3880sub reload_resources {
3477 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3478 3882
3883 reload_materials;
3479 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3480 reload_archetypes; 3887 reload_archetypes;
3481 reload_regions; 3888 reload_regions;
3482 reload_treasures; 3889 reload_treasures;
3483 3890
3484 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3485} 3892}
3486 3893
3487sub reload_config { 3894sub reload_config {
3488 warn "reloading config file...\n"; 3895 trace "reloading config file...\n";
3489 3896
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3897 my $config = load_file "$CONFDIR/config";
3491 or return; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3492 3900
3493 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>;
3495
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3902
3498 $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};
3499 $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};
3500 3905
3501 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3908 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3909 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3910 };
3506 warn $@ if $@; 3911 warn $@ if $@;
3507 } 3912 }
3508
3509 warn "finished reloading resource files\n";
3510} 3913}
3511 3914
3512sub pidfile() { 3915sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3917 or die "$PIDFILE: $!";
3527 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3528 print $fh $$; 3931 print $fh $$;
3529} 3932}
3530 3933
3531sub main_loop { 3934sub main_loop {
3532 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3533 if (1) { 3936 if (1) {
3534 EV::loop; 3937 EV::run;
3535 } 3938 }
3536 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3538} 3941}
3539 3942
3540sub main { 3943sub main {
3541 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3542 3945
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 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.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547 3950
3548 $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
3549 3952
3550 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3551 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3552 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#
3553 (async { 3956 (async {
3554 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3556 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3557 }; 3960 };
3558 3961
3559 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3560 3963
3561 cf::sync_job { 3964 cf::sync_job {
3562 cf::init_experience; 3965 cf::incloader::init ();
3966
3967 db_init;
3968
3563 cf::init_anim; 3969 cf::init_anim;
3564 cf::init_attackmess; 3970 cf::init_attackmess;
3565 cf::init_dynamic; 3971 cf::init_dynamic;
3566 3972
3567 cf::load_settings; 3973 cf::load_settings;
3568 cf::load_materials;
3569 3974
3570 reload_resources; 3975 reload_resources;
3571 reload_config; 3976 reload_config;
3572 db_init;
3573 3977
3574 cf::init_uuid; 3978 cf::init_uuid;
3575 cf::init_signals; 3979 cf::init_signals;
3576 cf::init_skills; 3980 cf::init_skills;
3577 3981
3585 3989
3586 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3991 use POSIX ();
3588 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};
3589 3993
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3591 }; 3995 };
3592 3996
3593 cf::object::thawer::errors_are_fatal 0; 3997 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n"; 3998 info "parse errors in files are no longer fatal from this point on.\n";
3595 3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
3596 main_loop; 4004 goto &main_loop;
3597} 4005}
3598 4006
3599############################################################################# 4007#############################################################################
3600# initialisation and cleanup 4008# initialisation and cleanup
3601 4009
3640 or return; 4048 or return;
3641 4049
3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3643 and return; 4051 and return;
3644 4052
3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3646 4054
3647 1 4055 1
3648} 4056}
3649 4057
3650our $uuid_lock; 4058our $uuid_lock;
3662 or return; 4070 or return;
3663 4071
3664 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3665 4073
3666 unless ($value) { 4074 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3668 return; 4076 return;
3669 } 4077 }
3670 4078
3671 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3672 $uuid_skip = 0; 4080 $uuid_skip = 0;
3682 or return; 4090 or return;
3683 4091
3684 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3685 and return; 4093 and return;
3686 4094
3687 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3688 4096
3689 1 4097 1
3690 4098
3691} 4099}
3692 4100
3698} 4106}
3699 4107
3700sub emergency_save() { 4108sub emergency_save() {
3701 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3702 4110
3703 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;
3704 4117
3705 cf::sync_job { 4118 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710 4120
3711 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3712 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3713 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3714 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3715 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3716 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3717 $pl->valid or next; 4127 $pl->valid or next;
3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3719 $pl->save; 4129 $pl->save;
3720 } 4130 }
3721 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3722 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3723 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3724 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3725 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3726 $map->valid or next; 4138 $map->valid or next;
3727 $map->save; 4139 $map->save;
3728 } 4140 }
3729 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3730 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3731 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3732 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3733 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3734 4148
3735 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3736 write_uuid_sync 1; 4150 write_uuid_sync 1;
3737 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
3738 }; 4171 };
3739 4172
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3745 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3746} 4174}
3747 4175
3748sub post_cleanup { 4176sub post_cleanup {
3749 my ($make_core) = @_; 4177 my ($make_core) = @_;
3750 4178
4179 IO::AIO::flush;
4180
3751 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3752 if $make_core; 4182 if $make_core;
3753 4183
3754 my $fh = pidfile; 4184 my $fh = pidfile;
3755 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3756} 4186}
3776 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3778 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3779# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780 } 4210 }
3781 warn "cleared package $pkg\n";#d#
3782} 4211}
3783 4212
3784sub do_reload_perl() { 4213sub do_reload_perl() {
3785 # can/must only be called in main 4214 # can/must only be called in main
3786 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3787 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3788 return; 4217 return;
3789 } 4218 }
3790 4219
3791 return if $RELOAD++; 4220 return if $RELOAD++;
3792 4221
3793 my $t1 = AE::time; 4222 my $t1 = AE::time;
3794 4223
3795 while ($RELOAD) { 4224 while ($RELOAD) {
3796 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3797 4227
3798 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3799 4229
3800 cf::sync_job { 4230 cf::sync_job {
3801 cf::write_runtime_sync; # external watchdog should not bark
3802 cf::emergency_save; 4231 #cf::emergency_save;
3803 cf::write_runtime_sync; # external watchdog should not bark
3804 4232
3805 warn "syncing database to disk";
3806 BDB::db_env_txn_checkpoint $DB_ENV;
3807
3808 # if anything goes wrong in here, we should simply crash as we already saved
3809
3810 warn "flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3816 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3817 %EXT_CORO = (); 4235 %EXT_CORO = ();
3818 4236
3819 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3820 %COMMAND = (); 4238 %COMMAND = ();
3821 4239
3822 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3823 %EXTCMD = (); 4241 %EXTCMD = ();
3824 %EXTICMD = (); 4242 %EXTICMD = ();
3825 4243
3826 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3827 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3828 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3829 4247
3830 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3831 eval { 4249 eval {
3832 $cb->($pkg); 4250 $cb->($pkg);
3833 1 4251 1
3834 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3835 } 4253 }
3836 4254
3837 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3838 clear_package $pkg; 4256 clear_package $pkg;
3839 } 4257 }
3840 4258
3841 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3842 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3843 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844 4262
3845 warn "... unloading $k"; 4263 trace "... unloading $k";
3846 delete $INC{$k}; 4264 delete $INC{$k};
3847 4265
3848 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3849 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3850 4268
3853 } 4271 }
3854 4272
3855 clear_package $k; 4273 clear_package $k;
3856 } 4274 }
3857 4275
3858 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3859 clear_package "safe::$_" 4277 clear_package "safe::$_"
3860 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);
3861 4279
3862 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3863 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3865 4283
3866 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3867 # and global variables created in xs 4285 # and global variables created in xs
3868 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3869 4287
3870 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3871 4289
3872 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3873 require cf; 4291 require cf;
3874 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3875 4293
3876 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3877 cf::reload_config; 4295 cf::reload_config;
3878 4296
3879 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3880 cf::load_extensions; 4298 cf::load_extensions;
3881 4299
3882 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3883 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3884 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3885 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3886 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3887 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3888 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3889 } 4307 }
3890 4308
3891 warn "running post_init jobs"; 4309 cf::_post_init 1;
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3893 4310
3894 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3895 4312
3896 1 4313 1
3897 } or do { 4314 } or do {
3898 warn $@; 4315 error $@;
3899 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3900 }; 4317 };
3901 4318
3902 warn "reloaded";
3903 --$RELOAD; 4319 --$RELOAD;
3904 } 4320 }
3905 4321
3906 $t1 = AE::time - $t1; 4322 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3908}; 4324};
3909 4325
3910our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3911 4327
3912sub reload_perl() { 4328sub reload_perl() {
3933 reload_perl; 4349 reload_perl;
3934 }; 4350 };
3935 } 4351 }
3936}; 4352};
3937 4353
3938unshift @INC, $LIBDIR; 4354#############################################################################
3939 4355
3940my $bug_warning = 0; 4356my $bug_warning = 0;
3941 4357
3942our @WAIT_FOR_TICK;
3943our @WAIT_FOR_TICK_BEGIN;
3944
3945sub wait_for_tick { 4358sub wait_for_tick() {
3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3947 4360
3948 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3949 push @WAIT_FOR_TICK, $signal;
3950 $signal->wait;
3951} 4362}
3952 4363
3953sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3955 4366
3956 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3957 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3958 $signal->wait; 4369 $signal->wait;
3959} 4370}
3963 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"
3964 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3965 return; 4376 return;
3966 } 4377 }
3967 4378
3968 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
3969 4380
3970 #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#
3971 4382
3972 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3973 $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.;
3974 Coro::async_pool { 4385 Coro::async_pool {
3975 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3976 write_runtime_sync 4387 write_runtime_sync
3977 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3978 }; 4389 };
3979 } 4390 }
3980 4391
3981 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3982 $sig->send; 4393 $sig->send;
3983 } 4394 }
3984 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3985 $sig->send;
3986 }
3987 4396
3988 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3989 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3990 4399
3991 if (0) { 4400 if (0) {
3992 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3993 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3994 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3995 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3996 } 4405 }
3997 } 4406 }
3998} 4407}
3999 4408
4000{ 4409{
4001 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4002 4412
4003 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4004 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4005 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4006 4416
4007 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
4008 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
4009 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4010 $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;
4035 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4036 }; 4446 };
4037 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4038 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4039 }; 4449 };
4450
4451 info "database initialised";
4040} 4452}
4041 4453
4042{ 4454{
4043 # configure IO::AIO 4455 # configure IO::AIO
4044 4456
4457 info "initialising aio";
4045 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4046 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4047 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4048} 4462}
4049 4463
4050my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
4051 4466
4052sub _log_backtrace { 4467sub _log_backtrace {
4053 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
4054 4469
4055 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
4056 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4057 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
4058 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
4059 ++$_log_backtrace; 4478 ++$_log_backtrace;
4060 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
4061 async { 4480 async {
4062 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4063 4482
4083 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4084 --$_log_backtrace; 4503 --$_log_backtrace;
4085 }; 4504 };
4086 } else { 4505 } else {
4087 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4088 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4089 } 4508 }
4090} 4509}
4091 4510
4092# load additional modules 4511# load additional modules
4093require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines