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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 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
77# strictly for debugging 80# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 82
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 84
85our @ORIG_INC;
86
82our %COMMAND = (); 87our %COMMAND = ();
83our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
84 89
85our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
87our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
90 97
91our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 99our @EVENT;
93our @REFLECT; # set by XS 100our @REFLECT; # set by XS
94our %REFLECT; # set by us 101our %REFLECT; # set by us
95 102
96our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
97our $DATADIR = datadir; 105our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
101our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 118
110our %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;
111 126
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 129our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 135our $DB_ENV;
121 136
122our @EXTRA_MODULES = qw(pod mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 138
124our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
125 141
126our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
128our $NOW; 145our $NOW;
129 146
130our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
141 158
142our @POST_INIT; 159our @POST_INIT;
143 160
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
146 166
147binmode STDOUT; 167binmode STDOUT;
148binmode STDERR; 168binmode STDERR;
149 169
150# read virtual server time, if available 170# read virtual server time, if available
161 181
162our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
163 183
164sub cf::map::normalise; 184sub cf::map::normalise;
165 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
166############################################################################# 190#############################################################################
167 191
168%REFLECT = (); 192%REFLECT = ();
169for (@REFLECT) { 193for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 194 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 195 $REFLECT{$reflect->{class}} = $reflect;
172} 196}
173 197
174# this is decidedly evil 198# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 199$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 200
177############################################################################# 201#############################################################################
178 202
179=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
180 204
181=over 4 205=over 4
182 206
183=item $cf::UPTIME 207=item $cf::UPTIME
184 208
185The 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.
186 225
187=item $cf::RUNTIME 226=item $cf::RUNTIME
188 227
189The 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
190every server tick. 229every server tick.
191 230
192=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
193$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
194$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
195 234
196Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
199database environment. 238database environment.
200 239
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 240=item $cf::LOADAVG
210 241
211The 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
212(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
213objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
221Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
222from wherever your confdir points to. 253from wherever your confdir points to.
223 254
224=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
225 256
226These 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.
227returns 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
228per 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();
229 278
230=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
231 280
232This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 283that call.
235 284
236=item %cf::REFLECT 285=item %cf::REFLECT
237 286
241 290
242=back 291=back
243 292
244=cut 293=cut
245 294
295sub error(@) { LOG llevError, join "", @_ }
296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
246$Coro::State::WARNHOOK = sub { 301$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 302 my $msg = join "", @_;
248 303
249 $msg .= "\n" 304 $msg .= "\n"
250 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
251 306
252 $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;
253 308
254 LOG llevError, $msg; 309 LOG llevWarn, $msg;
255}; 310};
256 311
257$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
259 314
260 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
261 316
262 if ($Coro::current == $Coro::main) {#d# 317 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 319 return;#d#
265 }#d# 320 }#d#
266 321
267 # kill coroutine otherwise 322 # kill coroutine otherwise
268 Coro::terminate 323 Coro::terminate
288)) { 343)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 345}
291 346
292$EV::DIED = sub { 347$EV::DIED = sub {
293 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
294}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
295 355
296############################################################################# 356#############################################################################
297 357
298=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
299 359
320 $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;
321 $d 381 $d
322 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
323} 383}
324 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
325=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
326 438
327Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
328 440
329=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
335our $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
336 448
337sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
341 498
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
344 501
345The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 503is a reload or not.
347 504
348=cut 505=cut
349 506
350sub post_init(&) { 507sub post_init(&) {
351 push @POST_INIT, shift; 508 push @POST_INIT, shift;
352} 509}
353 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
354=item cf::lock_wait $string 528=item cf::lock_wait $string
355 529
356Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
357 531
358=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
359 533
360Wait 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
361a 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,
395} 569}
396 570
397=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
398 572
399Like 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
400get spread over timer. 574get spread over time.
401 575
402=cut 576=cut
403 577
404sub periodic($$) { 578sub periodic($$) {
405 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
410} 584}
411 585
412=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
413 587
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
415This 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
416of 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.
417 595
418The 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
419used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
420 598
421Useful for short background jobs. 599Useful for short background jobs.
422 600
423=cut 601=cut
424 602
425our @SLOT_QUEUE; 603our @SLOT_QUEUE;
426our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
427 606
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
431 610
432 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
433 613
434 while () { 614 while () {
435 next_job: 615 next_job:
616
617 Coro::cede;
618
436 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 620
438 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 625 $job->[2]->send;
442 Coro::cede;
443 goto next_job; 626 goto next_job;
444 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 629 }
446 } 630 }
447 631
448 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
450 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait;
452 } else { 634 } else {
635 $busy = 0;
453 Coro::schedule; 636 Coro::schedule;
454 } 637 }
455 } 638 }
456}; 639};
457 640
458sub get_slot($;$$) { 641sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
460 643
461 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
462 645
463 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
464 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
465 649
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
480BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
481 665
482=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
483 667
484The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
485is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
486partly 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
487acceptable. 671acceptable.
488 672
489If 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
490the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
494=cut 678=cut
495 679
496sub sync_job(&) { 680sub sync_job(&) {
497 my ($job) = @_; 681 my ($job) = @_;
498 682
499 if ($Coro::current == $Coro::main) { 683 if (in_main) {
500 my $time = EV::time; 684 my $time = AE::time;
501 685
502 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
504 688
505 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
506 690
507 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
508 692
509 my $busy = 1; 693 my $busy = 1;
510 my @res; 694 my @res;
511 695
512 (async { 696 (async {
513 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 698 @res = eval { $job->() };
515 warn $@ if $@; 699 error $@ if $@;
516 undef $busy; 700 undef $busy;
517 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
518 702
519 while ($busy) { 703 while ($busy) {
520 if (Coro::nready) { 704 if (Coro::nready) {
521 Coro::cede_notself; 705 Coro::cede_notself;
522 } else { 706 } else {
523 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
524 } 708 }
525 } 709 }
526 710
527 my $time = EV::time - $time; 711 my $time = AE::time - $time;
528 712
529 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
530 714
531 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
532 } else { 716 } else {
554 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
555 739
556 $coro 740 $coro
557} 741}
558 742
559=item fork_call { }, $args 743=item fork_call { }, @args
560 744
561Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 748never block itself or use any form of event handling.
565 749
566=cut 750=cut
567 751
752sub post_fork {
753 reset_signals;
754}
755
568sub fork_call(&@) { 756sub fork_call(&@) {
569 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
570 758
571 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious)
574
575 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
576 reset_signals; 760 cf::post_fork;
577 &$cb 761 &$cb
578 }, @args; 762 } @args;
579 763
580 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 )
581} 776}
582 777
583=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
584 779
585=cut 780=cut
622within each server. 817within each server.
623 818
624=cut 819=cut
625 820
626sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
627 my ($name) = @_; 825 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
629 827
630 eval { 828 eval {
631 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
641} 839}
642 840
643our $DB; 841our $DB;
644 842
645sub db_init { 843sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
648 };
649} 845}
650 846
651sub db_get($$) { 847sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
653 849
654 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
655 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
656 854
657 $! ? () 855 $! ? ()
658 : $data 856 : $data
659 }
660} 857}
661 858
662sub db_put($$$) { 859sub db_put($$$) {
663 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 889
693 my @data; 890 my @data;
694 my $md5; 891 my $md5;
695 892
696 for (0 .. $#$src) { 893 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 895 }
700 896
701 # if processing is expensive, check 897 # if processing is expensive, check
702 # checksum first 898 # checksum first
703 if (1) { 899 if (1) {
716 912
717 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
718 } 914 }
719 } 915 }
720 916
721 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
722 my $data = $process->(\@data); 918 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
724 920
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 922
727 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
730 926
740 936
741=cut 937=cut
742 938
743sub datalog($@) { 939sub datalog($@) {
744 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 942}
747 943
748=back 944=back
749 945
750=cut 946=cut
945 1141
946 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1144
949 } elsif (ref $type) { 1145 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
951 1147
952 } else { 1148 } else {
953 shift @arg; 1149 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
955 } 1151 }
956 } 1152 }
957} 1153}
958 1154
959sub _object_attach { 1155sub _object_attach {
969 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
970 } 1166 }
971 1167
972 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
973 } else { 1169 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1171 }
976 1172
977 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
978} 1174}
979 1175
1038 1234
1039 for (@$callbacks) { 1235 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1041 1237
1042 if ($@) { 1238 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1240 override;
1046 } 1241 }
1047 1242
1048 return 1 if $override; 1243 return 1 if $override;
1049 } 1244 }
1128 for (@$attach) { 1323 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1131 } 1326 }
1132 } else { 1327 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1329 }
1135 } 1330 }
1136} 1331}
1137 1332
1138cf::attachable->attach ( 1333cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1166 1361
1167 sync_job { 1362 sync_job {
1168 if (length $$rdata) { 1363 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1172 1368
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1372 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1199 1395
1200 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1398 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1204 } 1400 }
1205 } else { 1401 } else {
1206 aio_unlink $filename; 1402 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1208 } 1404 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1429 $av = $st->{objs};
1234 } 1430 }
1235 1431
1236 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1239 1436
1240 ($data, $av) 1437 ($data, $av)
1241} 1438}
1242 1439
1243=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1247=cut 1444=cut
1248 1445
1249############################################################################# 1446#############################################################################
1250# command handling &c 1447# command handling &c
1251 1448
1252=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1253 1450
1254Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1255$name. 1452$name.
1256 1453
1257=cut 1454=cut
1263 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1264 1461
1265 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1266} 1463}
1267 1464
1268=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1269 1466
1270Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1271extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1272received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1273the 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
1274has logged in successfully. 1471has logged in successfully.
1275 1472
1276If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1277called.
1278 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
1279=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1280 1481
1281Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1282exticmd 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
1283are 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
1284is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1285log-in. 1486log-in.
1286 1487
1287If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1288called.
1289 1489
1290=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1291 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
1292sub register_extcmd { 1497sub register_extcmd($$) {
1293 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1294 1499
1295 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1296} 1501}
1297 1502
1298sub register_exticmd { 1503sub register_async_extcmd($$) {
1299 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1300 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1301 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1302} 1513}
1303 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1304use File::Glob (); 1521use File::Glob ();
1305 1522
1306cf::player->attach ( 1523cf::player->attach (
1307 on_command => sub { 1524 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1309 1526
1310 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1311 or return; 1528 or return;
1312 1529
1320 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1321 1538
1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323 1540
1324 if (ref $msg) { 1541 if (ref $msg) {
1325 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329 1543
1330 my @reply;
1331
1332 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}) {
1333 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1334 } 1562 }
1335 1563
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
1339 } else { 1564 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1566 }
1342 1567
1343 cf::override; 1568 cf::override;
1344 }, 1569 },
1345); 1570);
1355 }; 1580 };
1356 1581
1357 $grp 1582 $grp
1358} 1583}
1359 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
1360sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1361 cf::sync_job { 1601 cf::sync_job {
1362 my %todo; 1602 my %todo;
1363 1603
1364 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1605 next unless -r $path;
1383 1623
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1626
1387 $ext{source} = 1627 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1390 . $source 1630 . $source
1391 . "\n};\n1"; 1631 . "\n};\n1";
1392 1632
1393 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1394 } 1634 }
1395 1635
1636 my $pass = 0;
1396 my %done; 1637 my %done;
1397 while (%todo) { 1638 while (%todo) {
1398 my $progress; 1639 my $progress;
1399 1640
1641 ++$pass;
1642
1643 ext:
1400 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1646 next ext
1403 unless exists $done{$_}; 1647 unless exists $done{$_};
1404 } 1648 }
1405 1649
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1651
1408 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 $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1665
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1667 if exists $v->{meta}{mandatory};
1416 1668
1417 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;
1418 } 1678 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1679 }
1424 1680
1425 skip: 1681 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 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 }
1428 } 1691 }
1429 }; 1692 };
1430} 1693}
1431 1694
1432############################################################################# 1695#############################################################################
1516 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1517 } 1780 }
1518 } 1781 }
1519} 1782}
1520 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
1521sub save($) { 1797sub save($) {
1522 my ($pl) = @_; 1798 my ($pl) = @_;
1523 1799
1524 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1525 1801
1530 1806
1531 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1533 1809
1534 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];
1535 1814
1536 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1816 cf::cede_to_tick;
1538} 1817}
1539 1818
1573 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1574 1853
1575 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1576 $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
1577 1856
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1858 $pl->deactivate;
1859
1580 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;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1583 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1584 1865
1585 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1641 \@logins 1922 \@logins
1642} 1923}
1643 1924
1644=item $player->maps 1925=item $player->maps
1645 1926
1927=item cf::player::maps $login
1928
1646Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1647player. May block. 1930player. May block.
1648 1931
1649=cut 1932=cut
1650 1933
1671 1954
1672=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1673 1956
1674Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1675 1958
1676=item $player->ext_reply ($msgid, @msg)
1677
1678Sends an ext reply to the player.
1679
1680=cut
1681
1682sub ext_reply($$@) {
1683 my ($self, $id, @msg) = @_;
1684
1685 $self->ns->ext_reply ($id, @msg)
1686}
1687
1688=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1689 1960
1690Sends an ext event to the client. 1961Sends an ext event to the client.
1691 1962
1692=cut 1963=cut
1711 1982
1712=cut 1983=cut
1713 1984
1714sub find_by_path($) { 1985sub find_by_path($) {
1715 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1716 1989
1717 my ($match, $specificity); 1990 my ($match, $specificity);
1718 1991
1719 for my $region (list) { 1992 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1749sub generate_random_map { 2022sub generate_random_map {
1750 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1751 2024
1752 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
1753 2026
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 2028}
1769 2029
1770=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1771 2031
1772Register 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
1777 2037
1778sub register { 2038sub register {
1779 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 2040 my $pkg = caller;
1781 2041
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 2043
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 2045}
1787 2046
1788# also paths starting with '/' 2047# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 2049
1791sub thawer_merge { 2050sub thawer_merge {
1792 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1793 2052
1794 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1799} 2058}
1800 2059
1801sub normalise { 2060sub normalise {
1802 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1803 2062
1804 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1805 2064
1806 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1807 2066
1808 # map plan: 2067 # map plan:
1809 # 2068 #
1824 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 2084 $path = "$base/$path";
1826 } 2085 }
1827 2086
1828 for ($path) { 2087 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1832 } 2090 }
1833 2091
1834 $path 2092 $path
1848 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1849 return $self; 2107 return $self;
1850 } 2108 }
1851 } 2109 }
1852 2110
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2112 ()
1855} 2113}
1856 2114
2115# may re-bless or do other evil things
1857sub init { 2116sub init {
1858 my ($self) = @_; 2117 my ($self) = @_;
1859 2118
1860 $self 2119 $self
1861} 2120}
1926 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1927 2186
1928 1 2187 1
1929} 2188}
1930 2189
2190# used to laod the header of an original map
1931sub load_header_orig { 2191sub load_header_orig {
1932 my ($self) = @_; 2192 my ($self) = @_;
1933 2193
1934 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1935} 2195}
1936 2196
2197# used to laod the header of an instantiated map
1937sub load_header_temp { 2198sub load_header_temp {
1938 my ($self) = @_; 2199 my ($self) = @_;
1939 2200
1940 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1941} 2202}
1942 2203
2204# called after loading the header from an instantiated map
1943sub prepare_temp { 2205sub prepare_temp {
1944 my ($self) = @_; 2206 my ($self) = @_;
1945 2207
1946 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1948 # safety 2210 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2213}
1952 2214
2215# called after loading the header from an original map
1953sub prepare_orig { 2216sub prepare_orig {
1954 my ($self) = @_; 2217 my ($self) = @_;
1955 2218
1956 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1981 2244
1982sub find; 2245sub find;
1983sub find { 2246sub find {
1984 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1985 2248
2249 cf::cede_to_tick;
2250
1986 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1987 2252
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2255
1991 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2008 2273
2009 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2010 } 2275 }
2011} 2276}
2012 2277
2013sub pre_load { } 2278sub pre_load { }
2014sub post_load { } 2279#sub post_load { } # XS
2015 2280
2016sub load { 2281sub load {
2017 my ($self) = @_; 2282 my ($self) = @_;
2018 2283
2019 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2022 2287
2023 { 2288 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2025 2290
2026 return unless $self->valid; 2291 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2293
2031 $self->alloc; 2294 $self->alloc;
2032 2295
2033 $self->pre_load; 2296 $self->pre_load;
2034 cf::cede_to_tick; 2297 cf::cede_to_tick;
2035 2298
2299 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2301 $f->skip_block;
2038 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2039 or return; 2303 or return;
2040 2304
2041 $self->post_load_original 2305 $self->post_load_original
2042 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2043 2307
2044 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2309 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2312 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2051 } 2316 }
2052 } 2317 }
2053 }
2054 2318
2055 $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);
2056 2326
2057 cf::cede_to_tick; 2327 cf::cede_to_tick;
2058 # now do the right thing for maps 2328 # now do the right thing for maps
2059 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2335 $self->decay_objects;
2066 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2067 $self->update_buttons; 2337 $self->update_buttons;
2068 cf::cede_to_tick; 2338 cf::cede_to_tick;
2069 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2070 } 2340 }
2071 2341
2072 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2344 }
2077 2345
2078 $self->post_load; 2346 $self->post_load;
2079}
2080 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
2081sub customise_for { 2354sub customise_for {
2082 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2083 2356
2084 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2358 if $self->per_player;
2088# if $self->per_party; 2361# if $self->per_party;
2089 2362
2090 $self 2363 $self
2091} 2364}
2092 2365
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2366sub find_sync {
2120 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2121 2368
2122 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
2123} 2374}
2124 2375
2125sub do_load_sync { 2376sub do_load_sync {
2126 my ($map) = @_; 2377 my ($map) = @_;
2127 2378
2379 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2130 2382
2131 cf::sync_job { $map->load }; 2383 $map->load;
2132} 2384}
2133 2385
2134our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2136 2388
2137sub find_async { 2389sub find_async {
2138 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2139 2391
2140 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2141 2393
2142 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2144 } 2396 }
2145 2397
2146 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2147 2399
2148 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2149 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2150 2402
2151 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2152 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2153 if (my $map = find $k) { 2405 if (my $map = find $k) {
2154 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2155 } 2407 }
2156 2408
2157 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2158 } 2410 }
2159 } 2411 }
2162 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2163 2415
2164 () 2416 ()
2165} 2417}
2166 2418
2419# common code, used by both ->save and ->swapout
2167sub save { 2420sub _save {
2168 my ($self) = @_; 2421 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2422
2172 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2173 2424
2174 return unless $self->dirty; 2425 return unless $self->dirty;
2175 2426
2195 } else { 2446 } else {
2196 $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);
2197 } 2448 }
2198} 2449}
2199 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2200sub swap_out { 2459sub swap_out {
2201 my ($self) = @_; 2460 my ($self) = @_;
2202 2461
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2208 return if $self->players; 2466 return if $self->players;
2209 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
2210 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2211 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
2212 $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};
2213 2518
2214 $self->deactivate; 2519 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2521 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2522
2262 $self->unlink_save; 2523 $self->unlink_save;
2263 $self->destroy; 2524 $self->destroy;
2264} 2525}
2265 2526
2273 2534
2274 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2275 2536
2276 $self->unlink_save; 2537 $self->unlink_save;
2277 2538
2278 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2544
2340 : normalise $_ 2601 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2603 ]
2343} 2604}
2344 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
2345=back 2638=back
2346 2639
2347=head3 cf::object 2640=head3 cf::object
2348 2641
2349=cut 2642=cut
2372 2665
2373Creates 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.
2374 2667
2375=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2376 2669
2377returns 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,
2378even if the object actually exists. May block. 2671even if the object actually exists. May block.
2379 2672
2380=cut 2673=cut
2381 2674
2382sub deref { 2675sub deref {
2464=item $player_object->may ("access") 2757=item $player_object->may ("access")
2465 2758
2466Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2467(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2468 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
2469=cut 2787=cut
2470 2788
2471sub cf::object::player::may { 2789sub cf::object::player::may {
2472 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2473 2791
2474 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2475 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2476 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2477 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2478} 2796}
2479 2797
2480=item $player_object->enter_link 2798=item $player_object->enter_link
2481 2799
2482Freezes 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}>).
2483 2801
2484The 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.
2485for 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,
2486though, 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
2487map. 2805map.
2488 2806
2489Will 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.
2490 2814
2491=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2492 2816
2493Moves 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
2494map. 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
2512sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2513 my ($self) = @_; 2837 my ($self) = @_;
2514 2838
2515 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2516 2840
2841 ++$self->{_link_recursion};
2842
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2844
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2521 2847
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2849}
2524 2850
2525sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2527 2853
2544 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2546 2872
2547 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2550 2876
2551 $map->load; 2877 $map->load;
2552 $map->load_neighbours;
2553 2878
2554 return unless $self->contr->active; 2879 return unless $self->contr->active;
2555 2880
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2558 2883 # entering was successful
2884 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2885 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2886 $self->activate_recursive;
2561} 2887 }
2562 2888
2889}
2890
2563=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)]])
2564 2892
2565Moves 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
2566her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2567that 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
2568the 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
2575 2903
2576our $GOTOGEN; 2904our $GOTOGEN;
2577 2905
2578sub cf::object::player::goto { 2906sub cf::object::player::goto {
2579 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 }
2580 2914
2581 # 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
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2917
2584 $self->enter_link; 2918 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2605 } 2939 }
2606 } 2940 }
2607 2941
2608 my $map = eval { 2942 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2944
2611 if ($map) { 2945 if ($map) {
2612 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2948 } else {
2615 $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);
2616 } 2950 }
2617 2951
2618 $map 2952 $map
2626 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2629 } 2963 }
2630 2964
2631 $done->() if $done; 2965 $done->($self) if $done;
2632 })->prio (1); 2966 })->prio (1);
2633} 2967}
2634 2968
2635=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2636 2970
2704 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2705 3039
2706 unless (eval { 3040 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2708 3042
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2719 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 }
2720 3069
2721 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2722 3071
2723 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "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. "
2731 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2733 3082
2734 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 3084 $self->leave_link;
2736 } 3085 }
2737 })->prio (1); 3086 })->prio (1);
2738} 3087}
2739 3088
2740=head3 cf::client 3089=head3 cf::client
2741 3090
2742=over 4 3091=over 4
2743 3092
2744=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2745 3094
2746Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2747should not be used under normal circumstances. 3096them as required.
2748 3097
2749=cut 3098=cut
2750 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2751sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2752 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2753 3104
2754 utf8::encode $text; 3105 # try lzf for large packets
2755 $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);
2756} 3116}
2757 3117
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3119
2760Send 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
2761client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2762the 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
2763the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2764 3124
2765=cut 3125=cut
2766 3126
2767# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2769 "c/identify" => { 3135 "c/identify" => {
2770 id => "infobox", 3136 id => "infobox",
2771 title => "Identify", 3137 title => "Identify",
2772 reply => undef, 3138 reply => undef,
2773 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2775 "c/examine" => { 3141 "c/examine" => {
2776 id => "infobox", 3142 id => "infobox",
2777 title => "Examine", 3143 title => "Examine",
2778 reply => undef, 3144 reply => undef,
2779 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",
2780 }, 3152 },
2781 "c/book" => { 3153 "c/book" => {
2782 id => "infobox", 3154 id => "infobox",
2783 title => "Book", 3155 title => "Book",
2784 reply => undef, 3156 reply => undef,
2798 }, 3170 },
2799 "c/body" => { 3171 "c/body" => {
2800 id => "infobox", 3172 id => "infobox",
2801 title => "Body Parts", 3173 title => "Body Parts",
2802 reply => undef, 3174 reply => undef,
2803 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
2804 }, 3176 },
2805 "c/statistics" => { 3177 "c/statistics" => {
2806 id => "infobox", 3178 id => "infobox",
2807 title => "Statistics", 3179 title => "Statistics",
2808 reply => undef, 3180 reply => undef,
2860 id => "death", 3232 id => "death",
2861 title => "Death", 3233 title => "Death",
2862 reply => undef, 3234 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2864 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2865 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2867); 3245);
2868 3246
2869sub cf::client::send_msg { 3247sub cf::client::send_msg {
2900 my $pkt = "msg " 3278 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3279 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3281 );
2904 3282
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3283 $self->send_big_packet ($pkt);
2916} 3284}
2917 3285
2918=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2919 3287
2920Sends an ext event to the client. 3288Sends an ext event to the client.
2922=cut 3290=cut
2923 3291
2924sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2926 3294
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951} 3296}
2952 3297
2953=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2954 3299
2955Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2975 3320
2976 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2977 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2978 3323
2979 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;
2980} 3364}
2981 3365
2982cf::client->attach ( 3366cf::client->attach (
2983 on_connect => sub { 3367 on_connect => sub {
2984 my ($ns) = @_; 3368 my ($ns) = @_;
3010 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3011 3395
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013 3397
3014 if (ref $msg) { 3398 if (ref $msg) {
3015 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019 3400
3020 my @reply;
3021
3022 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}) {
3023 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3024 } 3419 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
3029 } else { 3420 } else {
3030 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";
3031 } 3422 }
3032 3423
3033 cf::override; 3424 cf::override;
3034 }, 3425 },
3035); 3426);
3055 3446
3056 $coro 3447 $coro
3057} 3448}
3058 3449
3059cf::client->attach ( 3450cf::client->attach (
3060 on_destroy => sub { 3451 on_client_destroy => sub {
3061 my ($ns) = @_; 3452 my ($ns) = @_;
3062 3453
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3455 },
3065); 3456);
3081our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3082 3473
3083$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3084 3475
3085$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3088 sort time 3479 sort time
3089)); 3480));
3090 3481
3091# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3120) { 3511) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3514 for @funs;
3125} 3515}
3126 3516
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3145 3535
3146 %vars = (_dummy => 0) unless %vars; 3536 %vars = (_dummy => 0) unless %vars;
3147 3537
3538 my @res;
3148 local $_; 3539 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3540
3151 my $eval = 3541 my $eval =
3152 "do {\n" 3542 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3545 . $code
3156 . "\n}" 3546 . "\n}"
3157 ; 3547 ;
3158 3548
3549 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 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 }
3162 3558
3163 if ($@) { 3559 if ($@) {
3164 warn "$@"; 3560 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3167 } 3563 }
3168 3564
3169 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3170} 3566}
3171 3567
3185=cut 3581=cut
3186 3582
3187sub register_script_function { 3583sub register_script_function {
3188 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3189 3585
3190 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3192} 3588}
3193 3589
3194=back 3590=back
3195 3591
3196=cut 3592=cut
3197 3593
3198############################################################################# 3594#############################################################################
3199# the server's init and main functions 3595# the server's init and main functions
3200 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
3201sub load_facedata($) { 3674sub load_facedata($) {
3202 my ($path) = @_; 3675 my ($path) = @_;
3203 3676
3204 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = ();
3207
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3678
3210 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3211 3680
3212 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3682
3218 $facedata->{version} == 2 3683 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3220 3685
3221 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3222 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3223 type => FT_RSRC, 3688
3224 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
3225 }; 3690
3226 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3227 3694
3228 { 3695 {
3229 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3230 3697
3231 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3701
3234 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3236 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};
3237 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};
3238 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3239 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3240 } 3709 }
3241 3710
3242 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3243 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3244 3713
3247 3716
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3720 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3722 }
3254
3255 cf::cede_to_tick;
3256 } 3723 }
3257 } 3724 }
3258 3725
3259 { 3726 {
3260 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3261 3728
3262 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3263 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3264 cf::cede_to_tick;
3265 } 3731 }
3266 3732
3267 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3268 } 3734 }
3269 3735
3270 { 3736 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3274 3738
3275 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3276 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
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3743
3280 if ($info->{type} & 1) {
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 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;
3295 } else { 3750 } else {
3296 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3297 } 3752 }
3298
3299 cf::cede_to_tick;
3300 } 3753 }
3301 } 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;
3302 3765
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3305 1 3770 1
3306} 3771}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3772
3328register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3330 3775
3331 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3339 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3341 cf::arch::commit_load; 3786 cf::arch::commit_load;
3342 3787
3343 $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;
3344} 3803}
3345 3804
3346sub reload_regions { 3805sub reload_regions {
3347 # 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
3348 # for this (global event?) 3807 # for this (global event?)
3356 if exists $_->{match}; 3815 if exists $_->{match};
3357 } 3816 }
3358} 3817}
3359 3818
3360sub reload_facedata { 3819sub reload_facedata {
3361 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3362 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3363} 3822}
3364 3823
3365sub reload_archetypes { 3824sub reload_archetypes {
3366 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3367 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;
3368} 3853}
3369 3854
3370sub reload_treasures { 3855sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3373} 3858}
3374 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
3375sub reload_resources { 3880sub reload_resources {
3376 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3377 3882
3883 reload_materials;
3378 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3379 reload_archetypes; 3887 reload_archetypes;
3380 reload_regions; 3888 reload_regions;
3381 reload_treasures; 3889 reload_treasures;
3382 3890
3383 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3384} 3892}
3385 3893
3386sub reload_config { 3894sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3388 or return;
3389 3896
3390 local $/; 3897 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3392 3900
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3902
3395 $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};
3396 $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};
3397 3905
3398 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3423 print $fh $$; 3931 print $fh $$;
3424} 3932}
3425 3933
3426sub main_loop { 3934sub main_loop {
3427 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3428 if (1) { 3936 if (1) {
3429 EV::loop; 3937 EV::run;
3430 } 3938 }
3431 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3433} 3941}
3434 3942
3435sub main { 3943sub main {
3436 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3437 3945
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 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.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442 3950
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $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
3449 3952
3450 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3452 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#
3453 (async { 3956 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3456 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3457 }; 3960 };
3458 3961
3459 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3460 3963
3461 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
3462 reload_resources; 3975 reload_resources;
3463 reload_config; 3976 reload_config;
3464 db_init;
3465 3977
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3978 cf::init_uuid;
3469 cf::init_signals; 3979 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3980 cf::init_skills;
3472 3981
3473 cf::init_beforeplay; 3982 cf::init_beforeplay;
3474 3983
3475 atomic; 3984 atomic;
3480 3989
3481 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3991 use POSIX ();
3483 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};
3484 3993
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3486 }; 3995 };
3487 3996
3997 cf::object::thawer::errors_are_fatal 0;
3998 info "parse errors in files are no longer fatal from this point on.\n";
3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
3488 main_loop; 4004 goto &main_loop;
3489} 4005}
3490 4006
3491############################################################################# 4007#############################################################################
3492# initialisation and cleanup 4008# initialisation and cleanup
3493 4009
3494# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3495BEGIN { 4011BEGIN {
3496 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3500 }; 4016 };
3501 } 4017 }
3502} 4018}
3503 4019
3504sub write_runtime_sync { 4020sub write_runtime_sync {
4021 my $t0 = AE::time;
4022
3505 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3507 4025
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 4027
3510 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3511 4029
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 4031 or return;
3514 4032
3515 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3530 or return; 4048 or return;
3531 4049
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 4051 and return;
3534 4052
3535 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 4054
3537 1 4055 1
3538} 4056}
3539 4057
3540our $uuid_lock; 4058our $uuid_lock;
3552 or return; 4070 or return;
3553 4071
3554 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3555 4073
3556 unless ($value) { 4074 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3558 return; 4076 return;
3559 } 4077 }
3560 4078
3561 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 4080 $uuid_skip = 0;
3572 or return; 4090 or return;
3573 4091
3574 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3575 and return; 4093 and return;
3576 4094
3577 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3578 4096
3579 1 4097 1
3580 4098
3581} 4099}
3582 4100
3588} 4106}
3589 4107
3590sub emergency_save() { 4108sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3592 4110
3593 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;
3594 4117
3595 cf::sync_job { 4118 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 4120
3601 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 4127 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 4129 $pl->save;
3610 } 4130 }
3611 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3612 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3613 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 4138 $map->valid or next;
3617 $map->save; 4139 $map->save;
3618 } 4140 }
3619 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3620 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3621 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3624 4148
3625 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 4150 write_uuid_sync 1;
3627 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
3628 }; 4171 };
3629 4172
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3636} 4174}
3637 4175
3638sub post_cleanup { 4176sub post_cleanup {
3639 my ($make_core) = @_; 4177 my ($make_core) = @_;
3640 4178
4179 IO::AIO::flush;
4180
3641 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 4182 if $make_core;
3643 4183
3644 my $fh = pidfile; 4184 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3646} 4186}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 4210 }
3671 warn "cleared package $pkg\n";#d#
3672} 4211}
3673 4212
3674sub do_reload_perl() { 4213sub do_reload_perl() {
3675 # can/must only be called in main 4214 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3677 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3678 return; 4217 return;
3679 } 4218 }
3680 4219
3681 return if $RELOAD++; 4220 return if $RELOAD++;
3682 4221
3683 my $t1 = EV::time; 4222 my $t1 = AE::time;
3684 4223
3685 while ($RELOAD) { 4224 while ($RELOAD) {
3686 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3687 4227
3688 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3689 4229
3690 cf::sync_job { 4230 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 4231 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 4232
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 4235 %EXT_CORO = ();
3708 4236
3709 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3710 %COMMAND = (); 4238 %COMMAND = ();
3711 4239
3712 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 4241 %EXTCMD = ();
3714 %EXTICMD = (); 4242 %EXTICMD = ();
3715 4243
3716 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3719 4247
3720 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3721 eval { 4249 eval {
3722 $cb->($pkg); 4250 $cb->($pkg);
3723 1 4251 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3725 } 4253 }
3726 4254
3727 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3728 clear_package $pkg; 4256 clear_package $pkg;
3729 } 4257 }
3730 4258
3731 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 4262
3735 warn "... unloading $k"; 4263 trace "... unloading $k";
3736 delete $INC{$k}; 4264 delete $INC{$k};
3737 4265
3738 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3740 4268
3743 } 4271 }
3744 4272
3745 clear_package $k; 4273 clear_package $k;
3746 } 4274 }
3747 4275
3748 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4277 clear_package "safe::$_"
3750 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);
3751 4279
3752 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4283
3756 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4285 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3759 4287
3760 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3761 4289
3762 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3763 require cf; 4291 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3765 4293
3766 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4295 cf::reload_config;
3768 4296
3769 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4298 cf::load_extensions;
3771 4299
3772 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3779 } 4307 }
3780 4308
3781 warn "running post_init jobs"; 4309 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4310
3784 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3785 4312
3786 1 4313 1
3787 } or do { 4314 } or do {
3788 warn $@; 4315 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4317 };
3791 4318
3792 warn "reloaded";
3793 --$RELOAD; 4319 --$RELOAD;
3794 } 4320 }
3795 4321
3796 $t1 = EV::time - $t1; 4322 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3798}; 4324};
3799 4325
3800our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3801 4327
3802sub reload_perl() { 4328sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3805 4331
3806 $RELOAD_WATCHER ||= cf::async { 4332 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4333 Coro::AIO::aio_wait cache_extensions;
3808 4334
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4336 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3812 }; 4338 };
3813 }; 4339 };
3814} 4340}
3823 reload_perl; 4349 reload_perl;
3824 }; 4350 };
3825 } 4351 }
3826}; 4352};
3827 4353
3828unshift @INC, $LIBDIR; 4354#############################################################################
3829 4355
3830my $bug_warning = 0; 4356my $bug_warning = 0;
3831 4357
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4358sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4360
3838 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4362}
3842 4363
3843sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4366
3846 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4369 $signal->wait;
3849} 4370}
3853 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"
3854 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3855 return; 4376 return;
3856 } 4377 }
3857 4378
3858 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#
3859 4382
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $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.;
3862 Coro::async_pool { 4385 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4387 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3866 }; 4389 };
3867 } 4390 }
3868 4391
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4393 $sig->send;
3871 } 4394 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4396
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4399
3879 if (0) { 4400 if (0) {
3880 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3884 } 4405 }
3885 } 4406 }
3886} 4407}
3887 4408
3888{ 4409{
3889 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3890 4412
3891 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3894 4416
3895 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $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;
3923 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3924 }; 4446 };
3925 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3927 }; 4449 };
4450
4451 info "database initialised";
3928} 4452}
3929 4453
3930{ 4454{
3931 # configure IO::AIO 4455 # configure IO::AIO
3932 4456
4457 info "initialising aio";
3933 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3936} 4462}
3937 4463
3938my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3939 4466
3940sub _log_backtrace { 4467sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3942 4469
3943 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3944 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4478 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
3949 async { 4480 async {
3950 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3951 4482
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4503 --$_log_backtrace;
3973 }; 4504 };
3974 } else { 4505 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4508 }
3978} 4509}
3979 4510
3980# load additional modules 4511# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3982 4514
3983END { cf::emergency_save } 4515END { cf::emergency_save }
3984 4516
39851 45171
3986 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines