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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines