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.464 by root, Thu Jan 1 18:35:48 2009 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
62use CBOR::XS ();
59use IO::AIO (); 63use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 64use Compress::LZF;
62use Digest::MD5 (); 65use Digest::MD5 ();
63 66
64AnyEvent::detect; 67AnyEvent::detect;
65 68
72 75
73# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
78 86
79our %COMMAND = (); 87our %COMMAND = ();
80our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
81 89
82our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
84our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
87 97
88our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
90 102
91our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
92our $DATADIR = datadir; 105our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
96our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 118
105our %RESOURCE; 119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
106 126
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 129our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
111 131
112our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 135our $DB_ENV;
116 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
117our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
118 141
119our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
121our $NOW; 145our $NOW;
122 146
123our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 156our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
134 158
135our @POST_INIT; 159our @POST_INIT;
136 160
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
138 166
139binmode STDOUT; 167binmode STDOUT;
140binmode STDERR; 168binmode STDERR;
141 169
142# read virtual server time, if available 170# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 172 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
147} 175}
148 176
177eval "sub TICK() { $TICK } 1" or die;
178
149mkdir $_ 179mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 181
152our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
153 183
154sub cf::map::normalise; 184sub cf::map::normalise;
155 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
156############################################################################# 190#############################################################################
157 191
192%REFLECT = ();
193for (@REFLECT) {
194 my $reflect = JSON::XS::decode_json $_;
195 $REFLECT{$reflect->{class}} = $reflect;
196}
197
198# this is decidedly evil
199$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
200
201#############################################################################
202
158=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
159 204
160=over 4 205=over 4
161 206
162=item $cf::UPTIME 207=item $cf::UPTIME
163 208
164The 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.
165 225
166=item $cf::RUNTIME 226=item $cf::RUNTIME
167 227
168The 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
169every server tick. 229every server tick.
170 230
171=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
172$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
173$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
174 234
175Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
178database environment. 238database environment.
179 239
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 240=item $cf::LOADAVG
189 241
190The 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
191(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
192objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
200Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
201from wherever your confdir points to. 253from wherever your confdir points to.
202 254
203=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
204 256
205These 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.
206returns 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
207per 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();
208 278
209=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
210 280
211This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 283that call.
214 284
285=item %cf::REFLECT
286
287Contains, for each (C++) class name, a hash reference with information
288about object members (methods, scalars, arrays and flags) and other
289metadata, which is useful for introspection.
290
215=back 291=back
216 292
217=cut 293=cut
218 294
219BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
301$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 302 my $msg = join "", @_;
222 303
223 $msg .= "\n" 304 $msg .= "\n"
224 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
225 306
226 $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;
227 308
228 LOG llevError, $msg; 309 LOG llevWarn, $msg;
229 }; 310};
230}
231 311
232$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
234 314
235 if ($Coro::current == $Coro::main) {#d# 315 error Carp::longmess $_[0];
316
317 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 319 return;#d#
238 }#d# 320 }#d#
239 321
240 # kill coroutine otherwise 322 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 323 Coro::terminate
243}; 324};
244
245$SIG{__DIE__} = sub { }; #d#?
246 325
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 329@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 343)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 345}
267 346
268$EV::DIED = sub { 347$EV::DIED = sub {
269 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
270}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
271 355
272############################################################################# 356#############################################################################
273 357
274=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
275 359
296 $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;
297 $d 381 $d
298 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
299} 383}
300 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
301=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
302 438
303Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
304 440
305=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
311our $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
312 448
313sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
317 498
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
320 501
321The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 503is a reload or not.
323 504
324=cut 505=cut
325 506
326sub post_init(&) { 507sub post_init(&) {
327 push @POST_INIT, shift; 508 push @POST_INIT, shift;
328} 509}
329 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
330=item cf::lock_wait $string 528=item cf::lock_wait $string
331 529
332Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
333 531
334=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
335 533
336Wait 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
337a 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,
371} 569}
372 570
373=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
374 572
375Like EV::periodic, but randomly selects a starting point so that the actions 573Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 574get spread over time.
377 575
378=cut 576=cut
379 577
380sub periodic($$) { 578sub periodic($$) {
381 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
386} 584}
387 585
388=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
389 587
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 595
394The 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
395used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
396 598
397Useful for short background jobs. 599Useful for short background jobs.
398 600
399=cut 601=cut
400 602
401our @SLOT_QUEUE; 603our @SLOT_QUEUE;
402our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
403 606
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
407 610
408 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
409 613
410 while () { 614 while () {
411 next_job: 615 next_job:
616
617 Coro::cede;
618
412 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 620
414 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 625 $job->[2]->send;
418 Coro::cede;
419 goto next_job; 626 goto next_job;
420 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 629 }
422 } 630 }
423 631
424 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else { 634 } else {
635 $busy = 0;
429 Coro::schedule; 636 Coro::schedule;
430 } 637 }
431 } 638 }
432}; 639};
433 640
434sub get_slot($;$$) { 641sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
436 643
437 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
438 645
439 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
440 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
441 649
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
456BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
457 665
458=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
459 667
460The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
461is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
462partly 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
463acceptable. 671acceptable.
464 672
465If 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
466the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
470=cut 678=cut
471 679
472sub sync_job(&) { 680sub sync_job(&) {
473 my ($job) = @_; 681 my ($job) = @_;
474 682
475 if ($Coro::current == $Coro::main) { 683 if (in_main) {
476 my $time = EV::time; 684 my $time = AE::time;
477 685
478 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
480 688
481 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
482 690
483 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
484 692
485 my $busy = 1; 693 my $busy = 1;
486 my @res; 694 my @res;
487 695
488 (async { 696 (async {
489 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 698 @res = eval { $job->() };
491 warn $@ if $@; 699 error $@ if $@;
492 undef $busy; 700 undef $busy;
493 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
494 702
495 while ($busy) { 703 while ($busy) {
496 if (Coro::nready) { 704 if (Coro::nready) {
497 Coro::cede_notself; 705 Coro::cede_notself;
498 } else { 706 } else {
499 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
500 } 708 }
501 } 709 }
502 710
503 my $time = EV::time - $time; 711 my $time = AE::time - $time;
504 712
505 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
506 714
507 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
508 } else { 716 } else {
530 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
531 739
532 $coro 740 $coro
533} 741}
534 742
535=item fork_call { }, $args 743=item fork_call { }, @args
536 744
537Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 748never block itself or use any form of event handling.
541 749
542=cut 750=cut
543 751
752sub post_fork {
753 reset_signals;
754}
755
544sub fork_call(&@) { 756sub fork_call(&@) {
545 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
546 758
547 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious)
550
551 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
552 reset_signals; 760 cf::post_fork;
553 &$cb 761 &$cb
554 }, @args; 762 } @args;
555 763
556 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
765}
766
767sub objinfo {
768 (
769 "counter value" => cf::object::object_count,
770 "objects created" => cf::object::create_count,
771 "objects destroyed" => cf::object::destroy_count,
772 "freelist size" => cf::object::free_count,
773 "allocated objects" => cf::object::objects_size,
774 "active objects" => cf::object::actives_size,
775 )
557} 776}
558 777
559=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
560 779
561=cut 780=cut
598within each server. 817within each server.
599 818
600=cut 819=cut
601 820
602sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
603 my ($name) = @_; 825 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
605 827
606 eval { 828 eval {
607 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
617} 839}
618 840
619our $DB; 841our $DB;
620 842
621sub db_init { 843sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
624 };
625} 845}
626 846
627sub db_get($$) { 847sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
629 849
630 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
631 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
632 854
633 $! ? () 855 $! ? ()
634 : $data 856 : $data
635 }
636} 857}
637 858
638sub db_put($$$) { 859sub db_put($$$) {
639 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 889
669 my @data; 890 my @data;
670 my $md5; 891 my $md5;
671 892
672 for (0 .. $#$src) { 893 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 895 }
676 896
677 # if processing is expensive, check 897 # if processing is expensive, check
678 # checksum first 898 # checksum first
679 if (1) { 899 if (1) {
692 912
693 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
694 } 914 }
695 } 915 }
696 916
697 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
698 my $data = $process->(\@data); 918 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
700 920
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 922
703 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
706 926
716 936
717=cut 937=cut
718 938
719sub datalog($@) { 939sub datalog($@) {
720 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 942}
723 943
724=back 944=back
725 945
726=cut 946=cut
921 1141
922 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1144
925 } elsif (ref $type) { 1145 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
927 1147
928 } else { 1148 } else {
929 shift @arg; 1149 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
931 } 1151 }
932 } 1152 }
933} 1153}
934 1154
935sub _object_attach { 1155sub _object_attach {
945 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
946 } 1166 }
947 1167
948 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
949 } else { 1169 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1171 }
952 1172
953 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
954} 1174}
955 1175
1014 1234
1015 for (@$callbacks) { 1235 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1017 1237
1018 if ($@) { 1238 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1240 override;
1022 } 1241 }
1023 1242
1024 return 1 if $override; 1243 return 1 if $override;
1025 } 1244 }
1104 for (@$attach) { 1323 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1107 } 1326 }
1108 } else { 1327 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1329 }
1111 } 1330 }
1112} 1331}
1113 1332
1114cf::attachable->attach ( 1333cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1142 1361
1143 sync_job { 1362 sync_job {
1144 if (length $$rdata) { 1363 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1148 1368
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1374 aio_fsync $fh;
1375 }
1153 aio_close $fh; 1376 aio_close $fh;
1154 1377
1155 if (@$objs) { 1378 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1379 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1380 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1383 if ($cf::USE_FSYNC) {
1384 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1385 aio_fsync $fh;
1386 }
1161 aio_close $fh; 1387 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1389 }
1164 } else { 1390 } else {
1165 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1169 1395
1170 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1398 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1174 } 1400 }
1175 } else { 1401 } else {
1176 aio_unlink $filename; 1402 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1178 } 1404 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1429 $av = $st->{objs};
1204 } 1430 }
1205 1431
1206 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1209 1436
1210 ($data, $av) 1437 ($data, $av)
1211} 1438}
1212 1439
1213=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1217=cut 1444=cut
1218 1445
1219############################################################################# 1446#############################################################################
1220# command handling &c 1447# command handling &c
1221 1448
1222=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1223 1450
1224Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1225$name. 1452$name.
1226 1453
1227=cut 1454=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1234 1461
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1463}
1237 1464
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1466
1240Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1243the 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
1244has logged in successfully. 1471has logged in successfully.
1245 1472
1246If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1247called.
1248 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
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1481
1251Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1252exticmd 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
1253are 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
1254is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1255log-in. 1486log-in.
1256 1487
1257If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1258called.
1259 1489
1260=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 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
1262sub register_extcmd { 1497sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1264 1499
1265 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1266} 1501}
1267 1502
1268sub register_exticmd { 1503sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1270 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1271 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1272} 1513}
1273 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1274use File::Glob (); 1521use File::Glob ();
1275 1522
1276cf::player->attach ( 1523cf::player->attach (
1277 on_command => sub { 1524 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1279 1526
1280 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1281 or return; 1528 or return;
1282 1529
1290 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1291 1538
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1540
1294 if (ref $msg) { 1541 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1543
1300 my @reply;
1301
1302 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}) {
1303 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1304 } 1562 }
1305 1563
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1309 } else { 1564 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1566 }
1312 1567
1313 cf::override; 1568 cf::override;
1314 }, 1569 },
1315); 1570);
1316 1571
1317# "readahead" all extensions 1572# "readahead" all extensions
1318sub cache_extensions { 1573sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1574 my $grp = IO::AIO::aio_group;
1320 1575
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1576 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1577 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1578 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1579 }
1325 }; 1580 };
1326 1581
1327 $grp 1582 $grp
1328} 1583}
1329 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
1330sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1331 cf::sync_job { 1601 cf::sync_job {
1332 my %todo; 1602 my %todo;
1333 1603
1334 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1605 next unless -r $path;
1353 1623
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1626
1357 $ext{source} = 1627 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1360 . $source 1630 . $source
1361 . "\n};\n1"; 1631 . "\n};\n1";
1362 1632
1363 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1364 } 1634 }
1365 1635
1636 my $pass = 0;
1366 my %done; 1637 my %done;
1367 while (%todo) { 1638 while (%todo) {
1368 my $progress; 1639 my $progress;
1369 1640
1641 ++$pass;
1642
1643 ext:
1370 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1646 next ext
1373 unless exists $done{$_}; 1647 unless exists $done{$_};
1374 } 1648 }
1375 1649
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1651
1378 unless (eval $v->{source}) { 1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1661 my $active = eval $source;
1662
1663 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1665
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1667 if exists $v->{meta}{mandatory};
1386 1668
1387 warn $msg; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1670 delete $todo{$k};
1671 } else {
1672 $done{$k} = delete $todo{$k};
1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1388 } 1678 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1679 }
1394 1680
1395 skip: 1681 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1683
1684 while (my ($k, $v) = each %todo) {
1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1686 if exists $v->{meta}{mandatory};
1687 }
1688
1689 last;
1690 }
1398 } 1691 }
1399 }; 1692 };
1400} 1693}
1401 1694
1402############################################################################# 1695#############################################################################
1486 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1487 } 1780 }
1488 } 1781 }
1489} 1782}
1490 1783
1784cf::player->attach (
1785 on_load => sub {
1786 my ($pl, $path) = @_;
1787
1788 # restore slots saved in save, below
1789 my $slots = delete $pl->{_slots};
1790
1791 $pl->ob->current_weapon ($slots->[0]);
1792 $pl->combat_ob ($slots->[1]);
1793 $pl->ranged_ob ($slots->[2]);
1794 },
1795);
1796
1491sub save($) { 1797sub save($) {
1492 my ($pl) = @_; 1798 my ($pl) = @_;
1493 1799
1494 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1495 1801
1500 1806
1501 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1503 1809
1504 cf::get_slot 0.01; 1810 cf::get_slot 0.01;
1811
1812 # save slots, to be restored later
1813 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1814
1506 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1816 cf::cede_to_tick;
1508} 1817}
1509 1818
1543 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1544 1853
1545 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1546 $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
1547 1856
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1858 $pl->deactivate;
1859
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1553 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1554 1865
1555 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1611 \@logins 1922 \@logins
1612} 1923}
1613 1924
1614=item $player->maps 1925=item $player->maps
1615 1926
1927=item cf::player::maps $login
1928
1616Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1617player. May block. 1930player. May block.
1618 1931
1619=cut 1932=cut
1620 1933
1641 1954
1642=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643 1956
1644Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1645 1958
1646=item $player->ext_reply ($msgid, @msg)
1647
1648Sends an ext reply to the player.
1649
1650=cut
1651
1652sub ext_reply($$@) {
1653 my ($self, $id, @msg) = @_;
1654
1655 $self->ns->ext_reply ($id, @msg)
1656}
1657
1658=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1659 1960
1660Sends an ext event to the client. 1961Sends an ext event to the client.
1661 1962
1662=cut 1963=cut
1681 1982
1682=cut 1983=cut
1683 1984
1684sub find_by_path($) { 1985sub find_by_path($) {
1685 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1686 1989
1687 my ($match, $specificity); 1990 my ($match, $specificity);
1688 1991
1689 for my $region (list) { 1992 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1719sub generate_random_map { 2022sub generate_random_map {
1720 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1721 2024
1722 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
1723 2026
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 2028}
1739 2029
1740=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1741 2031
1742Register 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
1747 2037
1748sub register { 2038sub register {
1749 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 2040 my $pkg = caller;
1751 2041
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 2043
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 2045}
1757 2046
1758# also paths starting with '/' 2047# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 2049
1761sub thawer_merge { 2050sub thawer_merge {
1762 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1763 2052
1764 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1769} 2058}
1770 2059
1771sub normalise { 2060sub normalise {
1772 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1773 2062
1774 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1775 2064
1776 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1777 2066
1778 # map plan: 2067 # map plan:
1779 # 2068 #
1794 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2084 $path = "$base/$path";
1796 } 2085 }
1797 2086
1798 for ($path) { 2087 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1802 } 2090 }
1803 2091
1804 $path 2092 $path
1818 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1819 return $self; 2107 return $self;
1820 } 2108 }
1821 } 2109 }
1822 2110
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2112 ()
1825} 2113}
1826 2114
2115# may re-bless or do other evil things
1827sub init { 2116sub init {
1828 my ($self) = @_; 2117 my ($self) = @_;
1829 2118
1830 $self 2119 $self
1831} 2120}
1896 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1897 2186
1898 1 2187 1
1899} 2188}
1900 2189
2190# used to laod the header of an original map
1901sub load_header_orig { 2191sub load_header_orig {
1902 my ($self) = @_; 2192 my ($self) = @_;
1903 2193
1904 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1905} 2195}
1906 2196
2197# used to laod the header of an instantiated map
1907sub load_header_temp { 2198sub load_header_temp {
1908 my ($self) = @_; 2199 my ($self) = @_;
1909 2200
1910 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1911} 2202}
1912 2203
2204# called after loading the header from an instantiated map
1913sub prepare_temp { 2205sub prepare_temp {
1914 my ($self) = @_; 2206 my ($self) = @_;
1915 2207
1916 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1918 # safety 2210 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2213}
1922 2214
2215# called after loading the header from an original map
1923sub prepare_orig { 2216sub prepare_orig {
1924 my ($self) = @_; 2217 my ($self) = @_;
1925 2218
1926 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1951 2244
1952sub find; 2245sub find;
1953sub find { 2246sub find {
1954 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1955 2248
2249 cf::cede_to_tick;
2250
1956 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1957 2252
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2255
1961 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
1978 2273
1979 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
1980 } 2275 }
1981} 2276}
1982 2277
1983sub pre_load { } 2278sub pre_load { }
1984sub post_load { } 2279#sub post_load { } # XS
1985 2280
1986sub load { 2281sub load {
1987 my ($self) = @_; 2282 my ($self) = @_;
1988 2283
1989 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
1992 2287
1993 { 2288 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
1995 2290
1996 return unless $self->valid; 2291 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2293
2001 $self->alloc; 2294 $self->alloc;
2002 2295
2003 $self->pre_load; 2296 $self->pre_load;
2004 cf::cede_to_tick; 2297 cf::cede_to_tick;
2005 2298
2299 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2301 $f->skip_block;
2008 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2009 or return; 2303 or return;
2010 2304
2011 $self->post_load_original 2305 $self->post_load_original
2012 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2013 2307
2014 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2309 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2312 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2021 } 2316 }
2022 } 2317 }
2023 }
2024 2318
2025 $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);
2026 2326
2027 cf::cede_to_tick; 2327 cf::cede_to_tick;
2028 # now do the right thing for maps 2328 # now do the right thing for maps
2029 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2335 $self->decay_objects;
2036 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2037 $self->update_buttons; 2337 $self->update_buttons;
2038 cf::cede_to_tick; 2338 cf::cede_to_tick;
2039 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2040 } 2340 }
2041 2341
2042 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2344 }
2047 2345
2048 $self->post_load; 2346 $self->post_load;
2049}
2050 2347
2348 1
2349}
2350
2351# customize the map for a given player, i.e.
2352# return the _real_ map. used by e.g. per-player
2353# maps to change the path to ~playername/mappath
2051sub customise_for { 2354sub customise_for {
2052 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2053 2356
2054 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2358 if $self->per_player;
2058# if $self->per_party; 2361# if $self->per_party;
2059 2362
2060 $self 2363 $self
2061} 2364}
2062 2365
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2366sub find_sync {
2090 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2091 2368
2092 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
2093} 2374}
2094 2375
2095sub do_load_sync { 2376sub do_load_sync {
2096 my ($map) = @_; 2377 my ($map) = @_;
2097 2378
2379 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2100 2382
2101 cf::sync_job { $map->load }; 2383 $map->load;
2102} 2384}
2103 2385
2104our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2106 2388
2107sub find_async { 2389sub find_async {
2108 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2109 2391
2110 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2111 2393
2112 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2114 } 2396 }
2115 2397
2116 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2117 2399
2118 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2120 2402
2121 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2122 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2123 if (my $map = find $k) { 2405 if (my $map = find $k) {
2124 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2125 } 2407 }
2126 2408
2127 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2128 } 2410 }
2129 } 2411 }
2132 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2133 2415
2134 () 2416 ()
2135} 2417}
2136 2418
2419# common code, used by both ->save and ->swapout
2137sub save { 2420sub _save {
2138 my ($self) = @_; 2421 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2422
2142 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2143 2424
2144 return unless $self->dirty; 2425 return unless $self->dirty;
2145 2426
2165 } else { 2446 } else {
2166 $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);
2167 } 2448 }
2168} 2449}
2169 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2170sub swap_out { 2459sub swap_out {
2171 my ($self) = @_; 2460 my ($self) = @_;
2172 2461
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2178 return if $self->players; 2466 return if $self->players;
2179 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
2180 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2181 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
2182 $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};
2183 2518
2184 $self->deactivate; 2519 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2521 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2522
2232 $self->unlink_save; 2523 $self->unlink_save;
2233 $self->destroy; 2524 $self->destroy;
2234} 2525}
2235 2526
2243 2534
2244 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2245 2536
2246 $self->unlink_save; 2537 $self->unlink_save;
2247 2538
2248 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2544
2310 : normalise $_ 2601 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2603 ]
2313} 2604}
2314 2605
2606=item cf::map::static_maps
2607
2608Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2609file in the shared directory excluding F</styles> and F</editor>). May
2610block.
2611
2612=cut
2613
2614sub static_maps() {
2615 my @dirs = "";
2616 my @maps;
2617
2618 while (@dirs) {
2619 my $dir = shift @dirs;
2620
2621 next if $dir eq "/styles" || $dir eq "/editor";
2622
2623 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2624 or return;
2625
2626 for (@$files) {
2627 s/\.map$// or next;
2628 utf8::decode $_;
2629 push @maps, "$dir/$_";
2630 }
2631
2632 push @dirs, map "$dir/$_", @$dirs;
2633 }
2634
2635 \@maps
2636}
2637
2315=back 2638=back
2316 2639
2317=head3 cf::object 2640=head3 cf::object
2318 2641
2319=cut 2642=cut
2342 2665
2343Creates 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.
2344 2667
2345=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2346 2669
2347returns 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,
2348even if the object actually exists. May block. 2671even if the object actually exists. May block.
2349 2672
2350=cut 2673=cut
2351 2674
2352sub deref { 2675sub deref {
2384 2707
2385our $SAY_CHANNEL = { 2708our $SAY_CHANNEL = {
2386 id => "say", 2709 id => "say",
2387 title => "Map", 2710 title => "Map",
2388 reply => "say ", 2711 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2712 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2713};
2391 2714
2392our $CHAT_CHANNEL = { 2715our $CHAT_CHANNEL = {
2393 id => "chat", 2716 id => "chat",
2394 title => "Chat", 2717 title => "Chat",
2434=item $player_object->may ("access") 2757=item $player_object->may ("access")
2435 2758
2436Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2437(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2438 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
2439=cut 2787=cut
2440 2788
2441sub cf::object::player::may { 2789sub cf::object::player::may {
2442 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2443 2791
2444 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2445 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2446 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2447 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2448} 2796}
2449 2797
2450=item $player_object->enter_link 2798=item $player_object->enter_link
2451 2799
2452Freezes 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}>).
2453 2801
2454The 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.
2455for 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,
2456though, 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
2457map. 2805map.
2458 2806
2459Will 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.
2460 2814
2461=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2462 2816
2463Moves 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
2464map. 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
2482sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2483 my ($self) = @_; 2837 my ($self) = @_;
2484 2838
2485 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2486 2840
2841 ++$self->{_link_recursion};
2842
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2844
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2491 2847
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2849}
2494 2850
2495sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2497 2853
2514 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2516 2872
2517 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2520 2876
2521 $map->load; 2877 $map->load;
2522 $map->load_neighbours;
2523 2878
2524 return unless $self->contr->active; 2879 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2880
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2530} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2531 2888
2889}
2890
2532=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)]])
2533 2892
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2903
2545our $GOTOGEN; 2904our $GOTOGEN;
2546 2905
2547sub cf::object::player::goto { 2906sub cf::object::player::goto {
2548 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 }
2549 2914
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2917
2553 $self->enter_link; 2918 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2574 } 2939 }
2575 } 2940 }
2576 2941
2577 my $map = eval { 2942 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2944
2580 if ($map) { 2945 if ($map) {
2581 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2948 } else {
2584 $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);
2585 } 2950 }
2586 2951
2587 $map 2952 $map
2595 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2598 } 2963 }
2599 2964
2600 $done->() if $done; 2965 $done->($self) if $done;
2601 })->prio (1); 2966 })->prio (1);
2602} 2967}
2603 2968
2604=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2605 2970
2673 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2674 3039
2675 unless (eval { 3040 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2677 3042
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2688 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 }
2689 3069
2690 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2691 3071
2692 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2702 3082
2703 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 3084 $self->leave_link;
2705 } 3085 }
2706 })->prio (1); 3086 })->prio (1);
2707} 3087}
2708 3088
2709=head3 cf::client 3089=head3 cf::client
2710 3090
2711=over 4 3091=over 4
2712 3092
2713=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2714 3094
2715Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2716should not be used under normal circumstances. 3096them as required.
2717 3097
2718=cut 3098=cut
2719 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2720sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2721 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2722 3104
2723 utf8::encode $text; 3105 # try lzf for large packets
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3106 $pkt = "lzf " . Compress::LZF::compress $pkt
3107 if 1024 <= length $pkt and $self->{can_lzf};
3108
3109 # split very large packets
3110 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3111 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3112 $pkt = "frag";
3113 }
3114
3115 $self->send_packet ($pkt);
2725} 3116}
2726 3117
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3119
2729Send 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
2730client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2731the 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
2732the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2733 3124
2734=cut 3125=cut
2735 3126
2736# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2738 "c/identify" => { 3135 "c/identify" => {
2739 id => "infobox", 3136 id => "infobox",
2740 title => "Identify", 3137 title => "Identify",
2741 reply => undef, 3138 reply => undef,
2742 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2744 "c/examine" => { 3141 "c/examine" => {
2745 id => "infobox", 3142 id => "infobox",
2746 title => "Examine", 3143 title => "Examine",
2747 reply => undef, 3144 reply => undef,
2748 tooltip => "Signs and other items you examined", 3145 tooltip => "Signs and other items you examined",
3146 },
3147 "c/shopinfo" => {
3148 id => "infobox",
3149 title => "Shop Info",
3150 reply => undef,
3151 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 3152 },
2750 "c/book" => { 3153 "c/book" => {
2751 id => "infobox", 3154 id => "infobox",
2752 title => "Book", 3155 title => "Book",
2753 reply => undef, 3156 reply => undef,
2769 id => "infobox", 3172 id => "infobox",
2770 title => "Body Parts", 3173 title => "Body Parts",
2771 reply => undef, 3174 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2773 }, 3176 },
3177 "c/statistics" => {
3178 id => "infobox",
3179 title => "Statistics",
3180 reply => undef,
3181 tooltip => "Shows your primary statistics",
3182 },
2774 "c/skills" => { 3183 "c/skills" => {
2775 id => "infobox", 3184 id => "infobox",
2776 title => "Skills", 3185 title => "Skills",
2777 reply => undef, 3186 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3187 tooltip => "Shows your experience per skill and item power",
3188 },
3189 "c/shopitems" => {
3190 id => "infobox",
3191 title => "Shop Items",
3192 reply => undef,
3193 tooltip => "Shows the items currently for sale in this shop",
3194 },
3195 "c/resistances" => {
3196 id => "infobox",
3197 title => "Resistances",
3198 reply => undef,
3199 tooltip => "Shows your resistances",
3200 },
3201 "c/pets" => {
3202 id => "infobox",
3203 title => "Pets",
3204 reply => undef,
3205 tooltip => "Shows information abotu your pets/a specific pet",
3206 },
3207 "c/perceiveself" => {
3208 id => "infobox",
3209 title => "Perceive Self",
3210 reply => undef,
3211 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3212 },
2780 "c/uptime" => { 3213 "c/uptime" => {
2781 id => "infobox", 3214 id => "infobox",
2782 title => "Uptime", 3215 title => "Uptime",
2783 reply => undef, 3216 reply => undef,
2799 id => "death", 3232 id => "death",
2800 title => "Death", 3233 title => "Death",
2801 reply => undef, 3234 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2803 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2804 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2806); 3245);
2807 3246
2808sub cf::client::send_msg { 3247sub cf::client::send_msg {
2839 my $pkt = "msg " 3278 my $pkt = "msg "
2840 . $self->{json_coder}->encode ( 3279 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 ); 3281 );
2843 3282
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt); 3283 $self->send_big_packet ($pkt);
2855} 3284}
2856 3285
2857=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2858 3287
2859Sends an ext event to the client. 3288Sends an ext event to the client.
2861=cut 3290=cut
2862 3291
2863sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2864 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2865 3294
2866 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove
2869 push @msg, msgtype => "event_$type";
2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 }
2872}
2873
2874=item $client->ext_reply ($msgid, @msg)
2875
2876Sends an ext reply to the client.
2877
2878=cut
2879
2880sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_;
2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2890} 3296}
2891 3297
2892=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2893 3299
2894Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2914 3320
2915 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2916 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2917 3323
2918 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;
2919} 3364}
2920 3365
2921cf::client->attach ( 3366cf::client->attach (
2922 on_connect => sub { 3367 on_connect => sub {
2923 my ($ns) = @_; 3368 my ($ns) = @_;
2949 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2950 3395
2951 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2952 3397
2953 if (ref $msg) { 3398 if (ref $msg) {
2954 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2955 "ARRAY" eq ref $msg
2956 ? @$msg
2957 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2958 3400
2959 my @reply;
2960
2961 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}) {
2962 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2963 } 3419 }
2964
2965 $ns->ext_reply ($reply, @reply)
2966 if $reply;
2967
2968 } else { 3420 } else {
2969 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";
2970 } 3422 }
2971 3423
2972 cf::override; 3424 cf::override;
2973 }, 3425 },
2974); 3426);
2994 3446
2995 $coro 3447 $coro
2996} 3448}
2997 3449
2998cf::client->attach ( 3450cf::client->attach (
2999 on_destroy => sub { 3451 on_client_destroy => sub {
3000 my ($ns) = @_; 3452 my ($ns) = @_;
3001 3453
3002 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3003 }, 3455 },
3004); 3456);
3020our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3021 3473
3022$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3023 3475
3024$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3026 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3027 sort time 3479 sort time
3028)); 3480));
3029 3481
3030# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3034The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3035 3487
3036 cf::object 3488 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3489 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3490 insert remove name archname title slaying race decrease split
3491 value
3039 3492
3040 cf::object::player 3493 cf::object::player
3041 player 3494 player
3042 3495
3043 cf::player 3496 cf::player
3049=cut 3502=cut
3050 3503
3051for ( 3504for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3505 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3058) { 3511) {
3059 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 for @funs; 3514 for @funs;
3063} 3515}
3064 3516
3079 3531
3080 my $qcode = $code; 3532 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3083 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3084 local $_; 3539 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars;
3086 3540
3087 my $eval = 3541 my $eval =
3088 "do {\n" 3542 "do {\n"
3089 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3090 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3091 . $code 3545 . $code
3092 . "\n}" 3546 . "\n}"
3093 ; 3547 ;
3094 3548
3549 if ($CFG{safe_eval}) {
3095 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3096 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3097 sub_generation_inc; 3553 sub_generation_inc;
3554 } else {
3555 local @cf::_safe_eval_args = values %vars;
3556 @res = wantarray ? eval eval : scalar eval $eval;
3557 }
3098 3558
3099 if ($@) { 3559 if ($@) {
3100 warn "$@"; 3560 warn "$@",
3101 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3102 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3103 } 3563 }
3104 3564
3105 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3106} 3566}
3107 3567
3121=cut 3581=cut
3122 3582
3123sub register_script_function { 3583sub register_script_function {
3124 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3125 3585
3126 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3127 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3128} 3588}
3129 3589
3130=back 3590=back
3131 3591
3132=cut 3592=cut
3133 3593
3134############################################################################# 3594#############################################################################
3135# the server's init and main functions 3595# the server's init and main functions
3136 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
3137sub load_facedata($) { 3674sub load_facedata($) {
3138 my ($path) = @_; 3675 my ($path) = @_;
3139 3676
3140 # HACK to clear player env face cache, we need some signal framework
3141 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = ();
3143
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145 3678
3146 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3147 3680
3148 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3149 0 < aio_load $path, $facedata
3150 or die "$path: $!";
3151
3152 $facedata = Coro::Storable::thaw $facedata;
3153 3682
3154 $facedata->{version} == 2 3683 $facedata->{version} == 2
3155 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3156 3685
3157 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3158 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3159 type => FT_RSRC, 3688
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3161 }; 3690
3162 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3163 3694
3164 { 3695 {
3165 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3166 3697
3167 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3168 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169 3701
3170 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3174 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3175 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3176 } 3709 }
3177 3710
3178 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3179 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3180 3713
3183 3716
3184 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3187 } else { 3720 } else {
3188 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3189 } 3722 }
3190
3191 cf::cede_to_tick;
3192 } 3723 }
3193 } 3724 }
3194 3725
3195 { 3726 {
3196 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3197 3728
3198 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3199 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3200 cf::cede_to_tick;
3201 } 3731 }
3202 3732
3203 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3204 } 3734 }
3205 3735
3206 { 3736 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3210 3738
3211 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3212 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
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215 3743
3216 if ($info->{type} & 1) {
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 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;
3231 } else { 3750 } else {
3232 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3233 } 3752 }
3234
3235 cf::cede_to_tick;
3236 } 3753 }
3237 } 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;
3238 3765
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3241 1 3770 1
3242} 3771}
3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263 3772
3264register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3266 3775
3267 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3275 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3277 cf::arch::commit_load; 3786 cf::arch::commit_load;
3278 3787
3279 $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;
3280} 3803}
3281 3804
3282sub reload_regions { 3805sub reload_regions {
3283 # 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
3284 # for this (global event?) 3807 # for this (global event?)
3292 if exists $_->{match}; 3815 if exists $_->{match};
3293 } 3816 }
3294} 3817}
3295 3818
3296sub reload_facedata { 3819sub reload_facedata {
3297 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3298 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3299} 3822}
3300 3823
3301sub reload_archetypes { 3824sub reload_archetypes {
3302 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3303 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;
3304} 3853}
3305 3854
3306sub reload_treasures { 3855sub reload_treasures {
3307 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3308 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3309} 3858}
3310 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
3311sub reload_resources { 3880sub reload_resources {
3312 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3313 3882
3883 reload_materials;
3314 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3315 reload_archetypes; 3887 reload_archetypes;
3316 reload_regions; 3888 reload_regions;
3317 reload_treasures; 3889 reload_treasures;
3318 3890
3319 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3320} 3892}
3321 3893
3322sub reload_config { 3894sub reload_config {
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3324 or return;
3325 3896
3326 local $/; 3897 my $config = load_file "$CONFDIR/config";
3327 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3328 3900
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3330 3902
3331 $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};
3332 $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};
3333 3905
3334 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3357 3929
3358 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3359 print $fh $$; 3931 print $fh $$;
3360} 3932}
3361 3933
3934sub main_loop {
3935 trace "EV::run starting\n";
3936 if (1) {
3937 EV::run;
3938 }
3939 trace "EV::run returned\n";
3940 goto &main_loop unless $REALLY_UNLOOP;
3941}
3942
3362sub main { 3943sub main {
3363 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3364 3945
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 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.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369 3950
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $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
3376 3952
3377 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3378 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3379 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#
3380 (async { 3956 (async {
3381 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3382 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3383 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3384 }; 3960 };
3385 3961
3386 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3387 3963
3388 cf::sync_job { 3964 cf::sync_job {
3965 cf::incloader::init ();
3966
3967 db_init;
3968
3969 cf::init_anim;
3970 cf::init_attackmess;
3971 cf::init_dynamic;
3972
3973 cf::load_settings;
3974
3389 reload_resources; 3975 reload_resources;
3390 reload_config; 3976 reload_config;
3391 db_init;
3392 3977
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid; 3978 cf::init_uuid;
3396 cf::init_signals; 3979 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills; 3980 cf::init_skills;
3399 3981
3400 cf::init_beforeplay; 3982 cf::init_beforeplay;
3401 3983
3402 atomic; 3984 atomic;
3404 load_extensions; 3986 load_extensions;
3405 3987
3406 utime time, time, $RUNTIMEFILE; 3988 utime time, time, $RUNTIMEFILE;
3407 3989
3408 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3991 use POSIX ();
3409 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};
3410 3993
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3412 }; 3995 };
3413 3996
3414 EV::loop; 3997 cf::object::thawer::errors_are_fatal 0;
3998 info "parse errors in files are no longer fatal from this point on.\n";
3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
4004 goto &main_loop;
3415} 4005}
3416 4006
3417############################################################################# 4007#############################################################################
3418# initialisation and cleanup 4008# initialisation and cleanup
3419 4009
3420# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3421BEGIN { 4011BEGIN {
3422 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3426 }; 4016 };
3427 } 4017 }
3428} 4018}
3429 4019
3430sub write_runtime_sync { 4020sub write_runtime_sync {
4021 my $t0 = AE::time;
4022
3431 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3433 4025
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435 4027
3436 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3437 4029
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3439 or return; 4031 or return;
3440 4032
3441 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3456 or return; 4048 or return;
3457 4049
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return; 4051 and return;
3460 4052
3461 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3462 4054
3463 1 4055 1
3464} 4056}
3465 4057
3466our $uuid_lock; 4058our $uuid_lock;
3478 or return; 4070 or return;
3479 4071
3480 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3481 4073
3482 unless ($value) { 4074 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3484 return; 4076 return;
3485 } 4077 }
3486 4078
3487 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0; 4080 $uuid_skip = 0;
3498 or return; 4090 or return;
3499 4091
3500 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3501 and return; 4093 and return;
3502 4094
3503 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3504 4096
3505 1 4097 1
3506 4098
3507} 4099}
3508 4100
3514} 4106}
3515 4107
3516sub emergency_save() { 4108sub emergency_save() {
3517 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3518 4110
3519 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;
3520 4117
3521 cf::sync_job { 4118 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526 4120
3527 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3530 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 4127 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 4129 $pl->save;
3536 } 4130 }
3537 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3538 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3539 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 4138 $map->valid or next;
3543 $map->save; 4139 $map->save;
3544 } 4140 }
3545 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3546 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3547 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3550 4148
3551 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 4150 write_uuid_sync 1;
3553 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
3554 }; 4171 };
3555 4172
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3561 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3562} 4174}
3563 4175
3564sub post_cleanup { 4176sub post_cleanup {
3565 my ($make_core) = @_; 4177 my ($make_core) = @_;
3566 4178
4179 IO::AIO::flush;
4180
3567 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3568 if $make_core; 4182 if $make_core;
3569 4183
3570 my $fh = pidfile; 4184 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3572} 4186}
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 } 4210 }
3597 warn "cleared package $pkg\n";#d#
3598} 4211}
3599 4212
3600sub do_reload_perl() { 4213sub do_reload_perl() {
3601 # can/must only be called in main 4214 # can/must only be called in main
3602 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3603 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3604 return; 4217 return;
3605 } 4218 }
3606 4219
3607 return if $RELOAD++; 4220 return if $RELOAD++;
3608 4221
3609 my $t1 = EV::time; 4222 my $t1 = AE::time;
3610 4223
3611 while ($RELOAD) { 4224 while ($RELOAD) {
3612 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3613 4227
3614 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3615 4229
3616 cf::sync_job { 4230 cf::sync_job {
3617 cf::write_runtime_sync; # external watchdog should not bark
3618 cf::emergency_save; 4231 #cf::emergency_save;
3619 cf::write_runtime_sync; # external watchdog should not bark
3620 4232
3621 warn "syncing database to disk";
3622 BDB::db_env_txn_checkpoint $DB_ENV;
3623
3624 # if anything goes wrong in here, we should simply crash as we already saved
3625
3626 warn "flushing outstanding aio requests";
3627 while (IO::AIO::nreqs || BDB::nreqs) {
3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3629 }
3630
3631 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3632 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3633 %EXT_CORO = (); 4235 %EXT_CORO = ();
3634 4236
3635 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3636 %COMMAND = (); 4238 %COMMAND = ();
3637 4239
3638 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3639 %EXTCMD = (); 4241 %EXTCMD = ();
3640 %EXTICMD = (); 4242 %EXTICMD = ();
3641 4243
3642 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3643 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3644 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3645 4247
3646 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3647 eval { 4249 eval {
3648 $cb->($pkg); 4250 $cb->($pkg);
3649 1 4251 1
3650 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3651 } 4253 }
3652 4254
3653 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3654 clear_package $pkg; 4256 clear_package $pkg;
3655 } 4257 }
3656 4258
3657 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660 4262
3661 warn "... unloading $k"; 4263 trace "... unloading $k";
3662 delete $INC{$k}; 4264 delete $INC{$k};
3663 4265
3664 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3666 4268
3669 } 4271 }
3670 4272
3671 clear_package $k; 4273 clear_package $k;
3672 } 4274 }
3673 4275
3674 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3675 clear_package "safe::$_" 4277 clear_package "safe::$_"
3676 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);
3677 4279
3678 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 4283
3682 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3683 # and global variables created in xs 4285 # and global variables created in xs
3684 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3685 4287
3686 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3687 4289
3688 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3689 require cf; 4291 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3691 4293
3692 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3693 cf::reload_config; 4295 cf::reload_config;
3694 4296
3695 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3696 cf::load_extensions; 4298 cf::load_extensions;
3697 4299
3698 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3699 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3700 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3701 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3702 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3703 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3704 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3705 } 4307 }
3706 4308
3707 warn "running post_init jobs"; 4309 cf::_post_init 1;
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709 4310
3710 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3711 4312
3712 1 4313 1
3713 } or do { 4314 } or do {
3714 warn $@; 4315 error $@;
3715 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3716 }; 4317 };
3717 4318
3718 warn "reloaded";
3719 --$RELOAD; 4319 --$RELOAD;
3720 } 4320 }
3721 4321
3722 $t1 = EV::time - $t1; 4322 $t1 = AE::time - $t1;
3723 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3724}; 4324};
3725 4325
3726our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3727 4327
3728sub reload_perl() { 4328sub reload_perl() {
3730 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3731 4331
3732 $RELOAD_WATCHER ||= cf::async { 4332 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions; 4333 Coro::AIO::aio_wait cache_extensions;
3734 4334
3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3736 do_reload_perl; 4336 do_reload_perl;
3737 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3738 }; 4338 };
3739 }; 4339 };
3740} 4340}
3749 reload_perl; 4349 reload_perl;
3750 }; 4350 };
3751 } 4351 }
3752}; 4352};
3753 4353
3754unshift @INC, $LIBDIR; 4354#############################################################################
3755 4355
3756my $bug_warning = 0; 4356my $bug_warning = 0;
3757 4357
3758our @WAIT_FOR_TICK;
3759our @WAIT_FOR_TICK_BEGIN;
3760
3761sub wait_for_tick { 4358sub wait_for_tick() {
3762 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3763 4360
3764 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3765 push @WAIT_FOR_TICK, $signal;
3766 $signal->wait;
3767} 4362}
3768 4363
3769sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3771 4366
3772 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3774 $signal->wait; 4369 $signal->wait;
3775} 4370}
3779 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"
3780 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3781 return; 4376 return;
3782 } 4377 }
3783 4378
3784 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4380
4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3785 4382
3786 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3787 $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.;
3788 Coro::async_pool { 4385 Coro::async_pool {
3789 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3790 write_runtime_sync 4387 write_runtime_sync
3791 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3792 }; 4389 };
3793 } 4390 }
3794 4391
3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3796 $sig->send; 4393 $sig->send;
3797 } 4394 }
3798 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3799 $sig->send;
3800 }
3801 4396
3802 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3804 4399
3805 if (0) { 4400 if (0) {
3806 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3807 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3810 } 4405 }
3811 } 4406 }
3812} 4407}
3813 4408
3814{ 4409{
3815 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3816 4412
3817 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3818 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3819 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3820 4416
3821 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3822 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3824 $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;
3849 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3850 }; 4446 };
3851 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3852 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3853 }; 4449 };
4450
4451 info "database initialised";
3854} 4452}
3855 4453
3856{ 4454{
3857 # configure IO::AIO 4455 # configure IO::AIO
3858 4456
4457 info "initialising aio";
3859 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3860 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3861 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3862} 4462}
3863 4463
3864my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3865 4466
3866sub _log_backtrace { 4467sub _log_backtrace {
3867 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3868 4469
3869 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3870 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3871 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3872 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3873 ++$_log_backtrace; 4478 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
3875 async { 4480 async {
3876 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3877 4482
3897 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3898 --$_log_backtrace; 4503 --$_log_backtrace;
3899 }; 4504 };
3900 } else { 4505 } else {
3901 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3903 } 4508 }
3904} 4509}
3905 4510
3906# load additional modules 4511# load additional modules
3907use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3908 4514
3909END { cf::emergency_save } 4515END { cf::emergency_save }
3910 4516
39111 45171
3912 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines