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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 2012 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 ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
77# strictly for debugging 79# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 81
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 83
84our @ORIG_INC;
85
82our %COMMAND = (); 86our %COMMAND = ();
83our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
84 88
85our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
87our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
90 96
91our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 98our @EVENT;
93our @REFLECT; # set by XS 99our @REFLECT; # set by XS
94our %REFLECT; # set by us 100our %REFLECT; # set by us
95 101
96our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
97our $DATADIR = datadir; 104our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
101our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 117
110our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
111 125
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 128our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 134our $DB_ENV;
121 135
122our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 137
124our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
125 140
126our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
128our $NOW; 144our $NOW;
129 145
130our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
141 157
142our @POST_INIT; 158our @POST_INIT;
143 159
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
146 165
147binmode STDOUT; 166binmode STDOUT;
148binmode STDERR; 167binmode STDERR;
149 168
150# read virtual server time, if available 169# read virtual server time, if available
161 180
162our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
163 182
164sub cf::map::normalise; 183sub cf::map::normalise;
165 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
166############################################################################# 189#############################################################################
167 190
168%REFLECT = (); 191%REFLECT = ();
169for (@REFLECT) { 192for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 194 $REFLECT{$reflect->{class}} = $reflect;
172} 195}
173 196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
174############################################################################# 200#############################################################################
175 201
176=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
177 203
178=over 4 204=over 4
179 205
180=item $cf::UPTIME 206=item $cf::UPTIME
181 207
182The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
183 224
184=item $cf::RUNTIME 225=item $cf::RUNTIME
185 226
186The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
187every server tick. 228every server tick.
188 229
189=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
190$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
191$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
192 233
193Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
194directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
195unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
196database environment. 237database environment.
197 238
198=item $cf::NOW
199
200The time of the last (current) server tick.
201
202=item $cf::TICK
203
204The interval between server ticks, in seconds.
205
206=item $cf::LOADAVG 239=item $cf::LOADAVG
207 240
208The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
209(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
210objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
218Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
219from wherever your confdir points to. 252from wherever your confdir points to.
220 253
221=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
222 255
223These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
224returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
225per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
226 277
227=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
228 279
229This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
231that call. 282that call.
232 283
233=item %cf::REFLECT 284=item %cf::REFLECT
234 285
235Contains, for each (C++) class name, a hash reference with information 286Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 287about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 288metadata, which is useful for introspection.
238 289
239=back 290=back
240 291
241=cut 292=cut
293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
242 299
243$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
244 my $msg = join "", @_; 301 my $msg = join "", @_;
245 302
246 $msg .= "\n" 303 $msg .= "\n"
247 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
248 305
249 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
250 307
251 LOG llevError, $msg; 308 LOG llevWarn, $msg;
252}; 309};
253 310
254$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
256 313
257 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
258 315
259 if ($Coro::current == $Coro::main) {#d# 316 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 318 return;#d#
262 }#d# 319 }#d#
263 320
264 # kill coroutine otherwise 321 # kill coroutine otherwise
265 Coro::terminate 322 Coro::terminate
285)) { 342)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 344}
288 345
289$EV::DIED = sub { 346$EV::DIED = sub {
290 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
291}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
292 354
293############################################################################# 355#############################################################################
294 356
295=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
296 358
317 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
318 $d 380 $d
319 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
320} 382}
321 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
322=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
323 437
324Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
325 439
326=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
333 447
334sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
335sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
336 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
337=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
338 483
339Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
341 486
342The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
343is a reload or not. 488is a reload or not.
344 489
345=cut 490=cut
346 491
347sub post_init(&) { 492sub post_init(&) {
348 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
349} 511}
350 512
351=item cf::lock_wait $string 513=item cf::lock_wait $string
352 514
353Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
392} 554}
393 555
394=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
395 557
396Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
397get spread over timer. 559get spread over time.
398 560
399=cut 561=cut
400 562
401sub periodic($$) { 563sub periodic($$) {
402 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
406 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
407} 569}
408 570
409=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
410 572
411Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
412This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
413of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
414 580
415The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
416used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
417 583
418Useful for short background jobs. 584Useful for short background jobs.
419 585
420=cut 586=cut
421 587
422our @SLOT_QUEUE; 588our @SLOT_QUEUE;
423our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
424 591
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
428 595
429 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
430 598
431 while () { 599 while () {
432 next_job: 600 next_job:
601
602 Coro::cede;
603
433 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 605
435 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 610 $job->[2]->send;
439 Coro::cede;
440 goto next_job; 611 goto next_job;
441 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 614 }
443 } 615 }
444 616
445 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
446 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
447 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait;
449 } else { 619 } else {
620 $busy = 0;
450 Coro::schedule; 621 Coro::schedule;
451 } 622 }
452 } 623 }
453}; 624};
454 625
455sub get_slot($;$$) { 626sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
457 628
458 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
459 630
460 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
461 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
462 634
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
491=cut 663=cut
492 664
493sub sync_job(&) { 665sub sync_job(&) {
494 my ($job) = @_; 666 my ($job) = @_;
495 667
496 if ($Coro::current == $Coro::main) { 668 if (in_main) {
497 my $time = EV::time; 669 my $time = AE::time;
498 670
499 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
501 673
502 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
503 675
504 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
505 677
506 my $busy = 1; 678 my $busy = 1;
507 my @res; 679 my @res;
508 680
509 (async { 681 (async {
510 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
511 @res = eval { $job->() }; 683 @res = eval { $job->() };
512 warn $@ if $@; 684 error $@ if $@;
513 undef $busy; 685 undef $busy;
514 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
515 687
516 while ($busy) { 688 while ($busy) {
517 if (Coro::nready) { 689 if (Coro::nready) {
519 } else { 691 } else {
520 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
521 } 693 }
522 } 694 }
523 695
524 my $time = EV::time - $time; 696 my $time = AE::time - $time;
525 697
526 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
527 699
528 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
529 } else { 701 } else {
551 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
552 724
553 $coro 725 $coro
554} 726}
555 727
556=item fork_call { }, $args 728=item fork_call { }, @args
557 729
558Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
559process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
560Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
561never block itself or use any form of event handling. 733never block itself or use any form of event handling.
562 734
563=cut 735=cut
564 736
737sub post_fork {
738 reset_signals;
739}
740
565sub fork_call(&@) { 741sub fork_call(&@) {
566 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
567 743
568 # we seemingly have to make a local copy of the whole thing,
569 # otherwise perl prematurely frees the stuff :/
570 # TODO: investigate and fix (likely this will be rather laborious)
571
572 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
573 reset_signals; 745 cf::post_fork;
574 &$cb 746 &$cb
575 }, @args; 747 } @args;
576 748
577 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
578} 761}
579 762
580=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
581 764
582=cut 765=cut
619within each server. 802within each server.
620 803
621=cut 804=cut
622 805
623sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
624 my ($name) = @_; 810 my ($name) = @_;
625 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
626 812
627 eval { 813 eval {
628 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
638} 824}
639 825
640our $DB; 826our $DB;
641 827
642sub db_init { 828sub db_init {
643 cf::sync_job {
644 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
645 };
646} 830}
647 831
648sub db_get($$) { 832sub db_get($$) {
649 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
650 834
651 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
652 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
653 839
654 $! ? () 840 $! ? ()
655 : $data 841 : $data
656 }
657} 842}
658 843
659sub db_put($$$) { 844sub db_put($$$) {
660 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
661 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
689 874
690 my @data; 875 my @data;
691 my $md5; 876 my $md5;
692 877
693 for (0 .. $#$src) { 878 for (0 .. $#$src) {
694 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
695 or Carp::croak "$src->[$_]: $!";
696 } 880 }
697 881
698 # if processing is expensive, check 882 # if processing is expensive, check
699 # checksum first 883 # checksum first
700 if (1) { 884 if (1) {
713 897
714 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
715 } 899 }
716 } 900 }
717 901
718 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
719 my $data = $process->(\@data); 903 my $data = $process->(\@data);
720 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
721 905
722 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
723 907
724 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
725 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
726 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
727 911
737 921
738=cut 922=cut
739 923
740sub datalog($@) { 924sub datalog($@) {
741 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
742 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
743} 927}
744 928
745=back 929=back
746 930
747=cut 931=cut
942 1126
943 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
944 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
945 1129
946 } elsif (ref $type) { 1130 } elsif (ref $type) {
947 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
948 1132
949 } else { 1133 } else {
950 shift @arg; 1134 shift @arg;
951 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
952 } 1136 }
953 } 1137 }
954} 1138}
955 1139
956sub _object_attach { 1140sub _object_attach {
966 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
967 } 1151 }
968 1152
969 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
970 } else { 1154 } else {
971 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
972 } 1156 }
973 1157
974 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
975} 1159}
976 1160
1035 1219
1036 for (@$callbacks) { 1220 for (@$callbacks) {
1037 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1038 1222
1039 if ($@) { 1223 if ($@) {
1040 warn "$@";
1041 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1042 override; 1225 override;
1043 } 1226 }
1044 1227
1045 return 1 if $override; 1228 return 1 if $override;
1046 } 1229 }
1125 for (@$attach) { 1308 for (@$attach) {
1126 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1127 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1128 } 1311 }
1129 } else { 1312 } else {
1130 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1131 } 1314 }
1132 } 1315 }
1133} 1316}
1134 1317
1135cf::attachable->attach ( 1318cf::attachable->attach (
1162 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1163 1346
1164 sync_job { 1347 sync_job {
1165 if (length $$rdata) { 1348 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1167 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1168 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1169 1353
1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1171 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1173 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
1195 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1196 1380
1197 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1199 } else { 1383 } else {
1200 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1201 } 1385 }
1202 } else { 1386 } else {
1203 aio_unlink $filename; 1387 aio_unlink $filename;
1204 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1205 } 1389 }
1229 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs}; 1414 $av = $st->{objs};
1231 } 1415 }
1232 1416
1233 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1234 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1235 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1236 1421
1237 ($data, $av) 1422 ($data, $av)
1238} 1423}
1239 1424
1240=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1244=cut 1429=cut
1245 1430
1246############################################################################# 1431#############################################################################
1247# command handling &c 1432# command handling &c
1248 1433
1249=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1250 1435
1251Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1252$name. 1437$name.
1253 1438
1254=cut 1439=cut
1260 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1261 1446
1262 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1263} 1448}
1264 1449
1265=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1266 1451
1267Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1268extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1269received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1270the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1271has logged in successfully. 1456has logged in successfully.
1272 1457
1273If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1274called.
1275 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1276=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1277 1466
1278Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1279exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1280are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1281is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1282log-in. 1471log-in.
1283 1472
1284If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1285called.
1286 1474
1287=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1288 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1289sub register_extcmd { 1482sub register_extcmd($$) {
1290 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1291 1484
1292 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1293} 1486}
1294 1487
1295sub register_exticmd { 1488sub register_async_extcmd($$) {
1296 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1297 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1298 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1299} 1498}
1300 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1301use File::Glob (); 1506use File::Glob ();
1302 1507
1303cf::player->attach ( 1508cf::player->attach (
1304 on_command => sub { 1509 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1306 1511
1307 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1308 or return; 1513 or return;
1309 1514
1317 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1318 1523
1319 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1320 1525
1321 if (ref $msg) { 1526 if (ref $msg) {
1322 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1323 "ARRAY" eq ref $msg
1324 ? @$msg
1325 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1326 1528
1327 my @reply;
1328
1329 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1330 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1331 } 1547 }
1332 1548
1333 $pl->ext_reply ($reply, @reply)
1334 if $reply;
1335
1336 } else { 1549 } else {
1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1338 } 1551 }
1339 1552
1340 cf::override; 1553 cf::override;
1341 }, 1554 },
1342); 1555);
1352 }; 1565 };
1353 1566
1354 $grp 1567 $grp
1355} 1568}
1356 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1357sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1358 cf::sync_job { 1586 cf::sync_job {
1359 my %todo; 1587 my %todo;
1360 1588
1361 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1362 next unless -r $path; 1590 next unless -r $path;
1380 1608
1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1383 1611
1384 $ext{source} = 1612 $ext{source} =
1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1386 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1387 . $source 1615 . $source
1388 . "\n};\n1"; 1616 . "\n};\n1";
1389 1617
1390 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1391 } 1619 }
1392 1620
1621 my $pass = 0;
1393 my %done; 1622 my %done;
1394 while (%todo) { 1623 while (%todo) {
1395 my $progress; 1624 my $progress;
1396 1625
1626 ++$pass;
1627
1628 ext:
1397 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1631 next ext
1400 unless exists $done{$_}; 1632 unless exists $done{$_};
1401 } 1633 }
1402 1634
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1636
1405 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1650
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1652 if exists $v->{meta}{mandatory};
1413 1653
1414 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1415 } 1663 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1664 }
1421 1665
1422 skip: 1666 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1425 } 1676 }
1426 }; 1677 };
1427} 1678}
1428 1679
1429############################################################################# 1680#############################################################################
1513 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1514 } 1765 }
1515 } 1766 }
1516} 1767}
1517 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1518sub save($) { 1782sub save($) {
1519 my ($pl) = @_; 1783 my ($pl) = @_;
1520 1784
1521 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1522 1786
1527 1791
1528 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1530 1794
1531 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1532 1799
1533 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1801 cf::cede_to_tick;
1535} 1802}
1536 1803
1570 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1571 1838
1572 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1573 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1574 1841
1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1576 $pl->deactivate; 1843 $pl->deactivate;
1844
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1579 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1580 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1581 1850
1582 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1583 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1584 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1638 \@logins 1907 \@logins
1639} 1908}
1640 1909
1641=item $player->maps 1910=item $player->maps
1642 1911
1912=item cf::player::maps $login
1913
1643Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1644player. May block. 1915player. May block.
1645 1916
1646=cut 1917=cut
1647 1918
1668 1939
1669=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1670 1941
1671Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1672 1943
1673=item $player->ext_reply ($msgid, @msg)
1674
1675Sends an ext reply to the player.
1676
1677=cut
1678
1679sub ext_reply($$@) {
1680 my ($self, $id, @msg) = @_;
1681
1682 $self->ns->ext_reply ($id, @msg)
1683}
1684
1685=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1686 1945
1687Sends an ext event to the client. 1946Sends an ext event to the client.
1688 1947
1689=cut 1948=cut
1708 1967
1709=cut 1968=cut
1710 1969
1711sub find_by_path($) { 1970sub find_by_path($) {
1712 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1713 1974
1714 my ($match, $specificity); 1975 my ($match, $specificity);
1715 1976
1716 for my $region (list) { 1977 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1746sub generate_random_map { 2007sub generate_random_map {
1747 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1748 2009
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 2011
1751 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1760 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1761 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1762 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1763 (cf::region::find $rmp->{region}), $rmp->{custom}
1764 )
1765} 2013}
1766 2014
1767=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1768 2016
1769Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1774 2022
1775sub register { 2023sub register {
1776 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1777 my $pkg = caller; 2025 my $pkg = caller;
1778 2026
1779 no strict;
1780 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1781 2028
1782 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1783} 2030}
1784 2031
1785# also paths starting with '/' 2032# also paths starting with '/'
1786$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1787 2034
1788sub thawer_merge { 2035sub thawer_merge {
1789 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1790 2037
1791 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1796} 2043}
1797 2044
1798sub normalise { 2045sub normalise {
1799 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1800 2047
1801 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1802 2049
1803 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1804 2051
1805 # map plan: 2052 # map plan:
1806 # 2053 #
1821 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1822 $path = "$base/$path"; 2069 $path = "$base/$path";
1823 } 2070 }
1824 2071
1825 for ($path) { 2072 for ($path) {
1826 redo if s{//}{/};
1827 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1828 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1829 } 2075 }
1830 2076
1831 $path 2077 $path
1845 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1846 return $self; 2092 return $self;
1847 } 2093 }
1848 } 2094 }
1849 2095
1850 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1851 () 2097 ()
1852} 2098}
1853 2099
2100# may re-bless or do other evil things
1854sub init { 2101sub init {
1855 my ($self) = @_; 2102 my ($self) = @_;
1856 2103
1857 $self 2104 $self
1858} 2105}
1923 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1924 2171
1925 1 2172 1
1926} 2173}
1927 2174
2175# used to laod the header of an original map
1928sub load_header_orig { 2176sub load_header_orig {
1929 my ($self) = @_; 2177 my ($self) = @_;
1930 2178
1931 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1932} 2180}
1933 2181
2182# used to laod the header of an instantiated map
1934sub load_header_temp { 2183sub load_header_temp {
1935 my ($self) = @_; 2184 my ($self) = @_;
1936 2185
1937 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1938} 2187}
1939 2188
2189# called after loading the header from an instantiated map
1940sub prepare_temp { 2190sub prepare_temp {
1941 my ($self) = @_; 2191 my ($self) = @_;
1942 2192
1943 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1945 # safety 2195 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2198}
1949 2199
2200# called after loading the header from an original map
1950sub prepare_orig { 2201sub prepare_orig {
1951 my ($self) = @_; 2202 my ($self) = @_;
1952 2203
1953 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1978 2229
1979sub find; 2230sub find;
1980sub find { 2231sub find {
1981 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1982 2233
2234 cf::cede_to_tick;
2235
1983 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1984 2237
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2240
1988 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2005 2258
2006 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2007 } 2260 }
2008} 2261}
2009 2262
2010sub pre_load { } 2263sub pre_load { }
2011sub post_load { } 2264#sub post_load { } # XS
2012 2265
2013sub load { 2266sub load {
2014 my ($self) = @_; 2267 my ($self) = @_;
2015 2268
2016 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2019 2272
2020 { 2273 {
2021 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2022 2275
2023 return unless $self->valid; 2276 return unless $self->valid;
2024 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2025
2026 $self->in_memory (cf::MAP_LOADING);
2027 2278
2028 $self->alloc; 2279 $self->alloc;
2029 2280
2030 $self->pre_load; 2281 $self->pre_load;
2031 cf::cede_to_tick; 2282 cf::cede_to_tick;
2032 2283
2284 if (exists $self->{load_path}) {
2033 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block; 2286 $f->skip_block;
2035 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2036 or return; 2288 or return;
2037 2289
2038 $self->post_load_original 2290 $self->post_load_original
2039 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2040 2292
2041 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2042 utf8::encode $uniq; 2294 utf8::encode $uniq;
2043 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2045 $self->clear_unique_items; 2297 $self->clear_unique_items;
2046 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2048 } 2301 }
2049 } 2302 }
2050 }
2051 2303
2052 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2053 2311
2054 cf::cede_to_tick; 2312 cf::cede_to_tick;
2055 # now do the right thing for maps 2313 # now do the right thing for maps
2056 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2057 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2061 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2062 $self->decay_objects; 2320 $self->decay_objects;
2063 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2064 $self->update_buttons; 2322 $self->update_buttons;
2065 cf::cede_to_tick; 2323 cf::cede_to_tick;
2066 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2067 } 2325 }
2068 2326
2069 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2070 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2071
2072 $self->in_memory (cf::MAP_ACTIVE);
2073 } 2329 }
2074 2330
2075 $self->post_load; 2331 $self->post_load;
2076}
2077 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2078sub customise_for { 2339sub customise_for {
2079 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2080 2341
2081 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2343 if $self->per_player;
2085# if $self->per_party; 2346# if $self->per_party;
2086 2347
2087 $self 2348 $self
2088} 2349}
2089 2350
2090# find and load all maps in the 3x3 area around a map
2091sub load_neighbours {
2092 my ($map) = @_;
2093
2094 my @neigh; # diagonal neighbours
2095
2096 for (0 .. 3) {
2097 my $neigh = $map->tile_path ($_)
2098 or next;
2099 $neigh = find $neigh, $map
2100 or next;
2101 $neigh->load;
2102
2103 push @neigh,
2104 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2105 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2106 }
2107
2108 for (grep defined $_->[0], @neigh) {
2109 my ($path, $origin) = @$_;
2110 my $neigh = find $path, $origin
2111 or next;
2112 $neigh->load;
2113 }
2114}
2115
2116sub find_sync { 2351sub find_sync {
2117 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2118 2353
2119 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2120} 2359}
2121 2360
2122sub do_load_sync { 2361sub do_load_sync {
2123 my ($map) = @_; 2362 my ($map) = @_;
2124 2363
2364 # it's a bug to call this from the main context
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2127 2367
2128 cf::sync_job { $map->load }; 2368 $map->load;
2129} 2369}
2130 2370
2131our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2132our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2133 2373
2134sub find_async { 2374sub find_async {
2135 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2136 2376
2137 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2138 2378
2139 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2141 } 2381 }
2142 2382
2143 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2144 2384
2145 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2159 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2160 2400
2161 () 2401 ()
2162} 2402}
2163 2403
2404# common code, used by both ->save and ->swapout
2164sub save { 2405sub _save {
2165 my ($self) = @_; 2406 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2407
2169 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2170 2409
2171 return unless $self->dirty; 2410 return unless $self->dirty;
2172 2411
2192 } else { 2431 } else {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 } 2433 }
2195} 2434}
2196 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2197sub swap_out { 2444sub swap_out {
2198 my ($self) = @_; 2445 my ($self) = @_;
2199 2446
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2205 return if $self->players; 2451 return if $self->players;
2206 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2207 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2208 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2209 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2210 2503
2211 $self->deactivate; 2504 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->clear; 2506 $self->clear;
2214}
2215
2216sub reset_at {
2217 my ($self) = @_;
2218
2219 # TODO: safety, remove and allow resettable per-player maps
2220 return 1e99 if $self->{deny_reset};
2221
2222 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2223 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2224
2225 $time + $to
2226}
2227
2228sub should_reset {
2229 my ($self) = @_;
2230
2231 $self->reset_at <= $cf::RUNTIME
2232}
2233
2234sub reset {
2235 my ($self) = @_;
2236
2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2238
2239 return if $self->players;
2240
2241 warn "resetting map ", $self->path, "\n";
2242
2243 $self->in_memory (cf::MAP_SWAPPED);
2244
2245 # need to save uniques path
2246 unless ($self->{deny_save}) {
2247 my $uniq = $self->uniq_path; utf8::encode $uniq;
2248
2249 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2250 if $uniq;
2251 }
2252
2253 delete $cf::MAP{$self->path};
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear;
2258 2507
2259 $self->unlink_save; 2508 $self->unlink_save;
2260 $self->destroy; 2509 $self->destroy;
2261} 2510}
2262 2511
2270 2519
2271 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2272 2521
2273 $self->unlink_save; 2522 $self->unlink_save;
2274 2523
2275 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2276 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2277 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2278 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2280 2529
2337 : normalise $_ 2586 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2588 ]
2340} 2589}
2341 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2342=back 2623=back
2343 2624
2344=head3 cf::object 2625=head3 cf::object
2345 2626
2346=cut 2627=cut
2369 2650
2370Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2371 2652
2372=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2373 2654
2374returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2375even if the object actually exists. May block. 2656even if the object actually exists. May block.
2376 2657
2377=cut 2658=cut
2378 2659
2379sub deref { 2660sub deref {
2461=item $player_object->may ("access") 2742=item $player_object->may ("access")
2462 2743
2463Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2464(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2465 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2466=cut 2772=cut
2467 2773
2468sub cf::object::player::may { 2774sub cf::object::player::may {
2469 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2470 2776
2471 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2472 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2474 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2475} 2781}
2476 2782
2477=item $player_object->enter_link 2783=item $player_object->enter_link
2478 2784
2479Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2480 2786
2481The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2482for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2483though, as the palyer cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2484map. 2790map.
2485 2791
2486Will never block. 2792Will never block.
2487 2793
2488=item $player_object->leave_link ($map, $x, $y) 2794=item $player_object->leave_link ($map, $x, $y)
2509sub cf::object::player::enter_link { 2815sub cf::object::player::enter_link {
2510 my ($self) = @_; 2816 my ($self) = @_;
2511 2817
2512 $self->deactivate_recursive; 2818 $self->deactivate_recursive;
2513 2819
2820 ++$self->{_link_recursion};
2821
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2822 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2823
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2824 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2825 if $self->map && $self->map->{path} ne "{link}";
2518 2826
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2827 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2828}
2521 2829
2522sub cf::object::player::leave_link { 2830sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2831 my ($self, $map, $x, $y) = @_;
2524 2832
2541 ($x, $y) = (-1, -1) 2849 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2850 unless (defined $x) && (defined $y);
2543 2851
2544 # use -1 or undef as default coordinates, not 0, 0 2852 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2853 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2854 if $x <= 0 && $y <= 0;
2547 2855
2548 $map->load; 2856 $map->load;
2549 $map->load_neighbours;
2550 2857
2551 return unless $self->contr->active; 2858 return unless $self->contr->active;
2552 2859
2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2860 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2554 $self->enter_map ($map, $x, $y); 2861 if ($self->enter_map ($map, $x, $y)) {
2555 2862 # entering was successful
2863 delete $self->{_link_recursion};
2556 # only activate afterwards, to support waiting in hooks 2864 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive; 2865 $self->activate_recursive;
2558} 2866 }
2559 2867
2868}
2869
2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2870=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2561 2871
2562Moves the player to the given map-path and coordinates by first freezing 2872Moves the player to the given map-path and coordinates by first freezing
2563her, loading and preparing them map, calling the provided $check callback 2873her, loading and preparing them map, calling the provided $check callback
2564that has to return the map if sucecssful, and then unfreezes the player on 2874that has to return the map if sucecssful, and then unfreezes the player on
2565the new (success) or old (failed) map position. In either case, $done will 2875the new (success) or old (failed) map position. In either case, $done will
2572 2882
2573our $GOTOGEN; 2883our $GOTOGEN;
2574 2884
2575sub cf::object::player::goto { 2885sub cf::object::player::goto {
2576 my ($self, $path, $x, $y, $check, $done) = @_; 2886 my ($self, $path, $x, $y, $check, $done) = @_;
2887
2888 if ($self->{_link_recursion} >= $MAX_LINKS) {
2889 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2890 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2891 ($path, $x, $y) = @$EMERGENCY_POSITION;
2892 }
2577 2893
2578 # do generation counting so two concurrent goto's will be executed in-order 2894 # do generation counting so two concurrent goto's will be executed in-order
2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2895 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2580 2896
2581 $self->enter_link; 2897 $self->enter_link;
2601 ($path, $x, $y) = (undef, undef, undef); 2917 ($path, $x, $y) = (undef, undef, undef);
2602 } 2918 }
2603 } 2919 }
2604 2920
2605 my $map = eval { 2921 my $map = eval {
2606 my $map = defined $path ? cf::map::find $path : undef; 2922 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2607 2923
2608 if ($map) { 2924 if ($map) {
2609 $map = $map->customise_for ($self); 2925 $map = $map->customise_for ($self);
2610 $map = $check->($map) if $check && $map; 2926 $map = $check->($map, $x, $y, $self) if $check && $map;
2611 } else { 2927 } else {
2612 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2928 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2613 } 2929 }
2614 2930
2615 $map 2931 $map
2623 if ($gen == $self->{_goto_generation}) { 2939 if ($gen == $self->{_goto_generation}) {
2624 delete $self->{_goto_generation}; 2940 delete $self->{_goto_generation};
2625 $self->leave_link ($map, $x, $y); 2941 $self->leave_link ($map, $x, $y);
2626 } 2942 }
2627 2943
2628 $done->() if $done; 2944 $done->($self) if $done;
2629 })->prio (1); 2945 })->prio (1);
2630} 2946}
2631 2947
2632=item $player_object->enter_exit ($exit_object) 2948=item $player_object->enter_exit ($exit_object)
2633 2949
2701 $Coro::current->{desc} = "enter_exit"; 3017 $Coro::current->{desc} = "enter_exit";
2702 3018
2703 unless (eval { 3019 unless (eval {
2704 $self->deactivate_recursive; # just to be sure 3020 $self->deactivate_recursive; # just to be sure
2705 3021
2706 # random map handling
2707 {
2708 my $guard = cf::lock_acquire "exit_prepare:$exit";
2709
2710 prepare_random_map $exit
2711 if $exit->slaying eq "/!";
2712 }
2713
2714 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3022 my $map = cf::map::normalise $exit->slaying, $exit->map;
2715 my $x = $exit->stats->hp; 3023 my $x = $exit->stats->hp;
2716 my $y = $exit->stats->sp; 3024 my $y = $exit->stats->sp;
3025
3026 # special map handling
3027 my $slaying = $exit->slaying;
3028
3029 # special map handling
3030 if ($slaying eq "/!") {
3031 my $guard = cf::lock_acquire "exit_prepare:$exit";
3032
3033 prepare_random_map $exit
3034 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3035
3036 $map = $exit->slaying;
3037
3038 } elsif ($slaying eq '!up') {
3039 $map = $exit->map->tile_path (cf::TILE_UP);
3040 $x = $exit->x;
3041 $y = $exit->y;
3042
3043 } elsif ($slaying eq '!down') {
3044 $map = $exit->map->tile_path (cf::TILE_DOWN);
3045 $x = $exit->x;
3046 $y = $exit->y;
3047 }
2717 3048
2718 $self->goto ($map, $x, $y); 3049 $self->goto ($map, $x, $y);
2719 3050
2720 # if exit is damned, update players death & WoR home-position 3051 # if exit is damned, update players death & WoR home-position
2721 $self->contr->savebed ($map, $x, $y) 3052 $self->contr->savebed ($map, $x, $y)
2726 $self->message ("Something went wrong deep within the deliantra server. " 3057 $self->message ("Something went wrong deep within the deliantra server. "
2727 . "I'll try to bring you back to the map you were before. " 3058 . "I'll try to bring you back to the map you were before. "
2728 . "Please report this to the dungeon master!", 3059 . "Please report this to the dungeon master!",
2729 cf::NDI_UNIQUE | cf::NDI_RED); 3060 cf::NDI_UNIQUE | cf::NDI_RED);
2730 3061
2731 warn "ERROR in enter_exit: $@"; 3062 error "ERROR in enter_exit: $@";
2732 $self->leave_link; 3063 $self->leave_link;
2733 } 3064 }
2734 })->prio (1); 3065 })->prio (1);
2735} 3066}
2736 3067
2737=head3 cf::client 3068=head3 cf::client
2738 3069
2739=over 4 3070=over 4
2740 3071
2741=item $client->send_drawinfo ($text, $flags) 3072=item $client->send_big_packet ($pkt)
2742 3073
2743Sends a drawinfo packet to the client. Circumvents output buffering so 3074Like C<send_packet>, but tries to compress large packets, and fragments
2744should not be used under normal circumstances. 3075them as required.
2745 3076
2746=cut 3077=cut
2747 3078
3079our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3080
2748sub cf::client::send_drawinfo { 3081sub cf::client::send_big_packet {
2749 my ($self, $text, $flags) = @_; 3082 my ($self, $pkt) = @_;
2750 3083
2751 utf8::encode $text; 3084 # try lzf for large packets
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3085 $pkt = "lzf " . Compress::LZF::compress $pkt
3086 if 1024 <= length $pkt and $self->{can_lzf};
3087
3088 # split very large packets
3089 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3090 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3091 $pkt = "frag";
3092 }
3093
3094 $self->send_packet ($pkt);
2753} 3095}
2754 3096
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 3098
2757Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send a msg packet to the client, formatting the msg for the client if
2758client if neccessary. C<$type> should be a string identifying the type of 3100necessary. C<$type> should be a string identifying the type of the
2759the message, with C<log> being the default. If C<$color> is negative, suppress 3101message, with C<log> being the default. If C<$color> is negative, suppress
2760the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
2761 3103
2762=cut 3104=cut
2763 3105
2764# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 3107our %CHANNEL = (
3108 "c/motd" => {
3109 id => "infobox",
3110 title => "MOTD",
3111 reply => undef,
3112 tooltip => "The message of the day",
3113 },
2766 "c/identify" => { 3114 "c/identify" => {
2767 id => "infobox", 3115 id => "infobox",
2768 title => "Identify", 3116 title => "Identify",
2769 reply => undef, 3117 reply => undef,
2770 tooltip => "Items recently identified", 3118 tooltip => "Items recently identified",
2772 "c/examine" => { 3120 "c/examine" => {
2773 id => "infobox", 3121 id => "infobox",
2774 title => "Examine", 3122 title => "Examine",
2775 reply => undef, 3123 reply => undef,
2776 tooltip => "Signs and other items you examined", 3124 tooltip => "Signs and other items you examined",
3125 },
3126 "c/shopinfo" => {
3127 id => "infobox",
3128 title => "Shop Info",
3129 reply => undef,
3130 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 3131 },
2778 "c/book" => { 3132 "c/book" => {
2779 id => "infobox", 3133 id => "infobox",
2780 title => "Book", 3134 title => "Book",
2781 reply => undef, 3135 reply => undef,
2857 id => "death", 3211 id => "death",
2858 title => "Death", 3212 title => "Death",
2859 reply => undef, 3213 reply => undef,
2860 tooltip => "Reason for and more info about your most recent death", 3214 tooltip => "Reason for and more info about your most recent death",
2861 }, 3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
2862 "c/say" => $SAY_CHANNEL, 3222 "c/say" => $SAY_CHANNEL,
2863 "c/chat" => $CHAT_CHANNEL, 3223 "c/chat" => $CHAT_CHANNEL,
2864); 3224);
2865 3225
2866sub cf::client::send_msg { 3226sub cf::client::send_msg {
2897 my $pkt = "msg " 3257 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3258 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3259 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3260 );
2901 3261
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3262 $self->send_big_packet ($pkt);
2913} 3263}
2914 3264
2915=item $client->ext_msg ($type, @msg) 3265=item $client->ext_msg ($type, @msg)
2916 3266
2917Sends an ext event to the client. 3267Sends an ext event to the client.
2919=cut 3269=cut
2920 3270
2921sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
2923 3273
2924 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930}
2931
2932=item $client->ext_reply ($msgid, @msg)
2933
2934Sends an ext reply to the client.
2935
2936=cut
2937
2938sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_;
2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948} 3275}
2949 3276
2950=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
2951 3278
2952Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
2972 3299
2973 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
2974 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
2975 3302
2976 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
2977} 3343}
2978 3344
2979cf::client->attach ( 3345cf::client->attach (
2980 on_connect => sub { 3346 on_connect => sub {
2981 my ($ns) = @_; 3347 my ($ns) = @_;
3007 my ($ns, $buf) = @_; 3373 my ($ns, $buf) = @_;
3008 3374
3009 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3010 3376
3011 if (ref $msg) { 3377 if (ref $msg) {
3012 my ($type, $reply, @payload) = 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3013 "ARRAY" eq ref $msg
3014 ? @$msg
3015 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3016 3379
3017 my @reply;
3018
3019 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
3020 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
3021 } 3398 }
3022
3023 $ns->ext_reply ($reply, @reply)
3024 if $reply;
3025
3026 } else { 3399 } else {
3027 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3028 } 3401 }
3029 3402
3030 cf::override; 3403 cf::override;
3031 }, 3404 },
3032); 3405);
3052 3425
3053 $coro 3426 $coro
3054} 3427}
3055 3428
3056cf::client->attach ( 3429cf::client->attach (
3057 on_destroy => sub { 3430 on_client_destroy => sub {
3058 my ($ns) = @_; 3431 my ($ns) = @_;
3059 3432
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3433 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3434 },
3062); 3435);
3078our $safe_hole = new Safe::Hole; 3451our $safe_hole = new Safe::Hole;
3079 3452
3080$SIG{FPE} = 'IGNORE'; 3453$SIG{FPE} = 'IGNORE';
3081 3454
3082$safe->permit_only (Opcode::opset qw( 3455$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3456 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3457 grepstart grepwhile mapstart mapwhile
3085 sort time 3458 sort time
3086)); 3459));
3087 3460
3088# here we export the classes and methods available to script code 3461# here we export the classes and methods available to script code
3113 decrease split destroy change_exp value msg lore send_msg)], 3486 decrease split destroy change_exp value msg lore send_msg)],
3114 ["cf::object::player" => qw(player)], 3487 ["cf::object::player" => qw(player)],
3115 ["cf::player" => qw(peaceful send_msg)], 3488 ["cf::player" => qw(peaceful send_msg)],
3116 ["cf::map" => qw(trigger)], 3489 ["cf::map" => qw(trigger)],
3117) { 3490) {
3118 no strict 'refs';
3119 my ($pkg, @funs) = @$_; 3491 my ($pkg, @funs) = @$_;
3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3492 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3121 for @funs; 3493 for @funs;
3122} 3494}
3123 3495
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3512 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3513 $qcode =~ s/\n/\\n/g;
3142 3514
3143 %vars = (_dummy => 0) unless %vars; 3515 %vars = (_dummy => 0) unless %vars;
3144 3516
3517 my @res;
3145 local $_; 3518 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3519
3148 my $eval = 3520 my $eval =
3149 "do {\n" 3521 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3522 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3523 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3524 . $code
3153 . "\n}" 3525 . "\n}"
3154 ; 3526 ;
3155 3527
3528 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3529 sub_generation_inc;
3530 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3531 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3532 sub_generation_inc;
3533 } else {
3534 local @cf::_safe_eval_args = values %vars;
3535 @res = wantarray ? eval eval : scalar eval $eval;
3536 }
3159 3537
3160 if ($@) { 3538 if ($@) {
3161 warn "$@"; 3539 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3540 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3541 "with arguments " . (join " ", %vars) . "\n";
3164 } 3542 }
3165 3543
3166 wantarray ? @res : $res[0] 3544 wantarray ? @res : $res[0]
3167} 3545}
3168 3546
3182=cut 3560=cut
3183 3561
3184sub register_script_function { 3562sub register_script_function {
3185 my ($fun, $cb) = @_; 3563 my ($fun, $cb) = @_;
3186 3564
3187 no strict 'refs'; 3565 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3566 *$fun = $safe_hole->wrap ($cb);
3189} 3567}
3190 3568
3191=back 3569=back
3192 3570
3193=cut 3571=cut
3194 3572
3195############################################################################# 3573#############################################################################
3196# the server's init and main functions 3574# the server's init and main functions
3197 3575
3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3652
3198sub load_facedata($) { 3653sub load_facedata($) {
3199 my ($path) = @_; 3654 my ($path) = @_;
3200 3655
3201 # HACK to clear player env face cache, we need some signal framework
3202 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = ();
3204
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3657
3207 warn "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3208 3659
3209 my $facedata; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3210 0 < aio_load $path, $facedata
3211 or die "$path: $!";
3212
3213 $facedata = Coro::Storable::thaw $facedata;
3214 3661
3215 $facedata->{version} == 2 3662 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3217 3664
3218 # patch in the exptable 3665 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3219 $facedata->{resource}{"res/exp_table"} = { 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3220 type => FT_RSRC, 3667
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3222 }; 3669
3223 cf::cede_to_tick; 3670 # BEGIN ATOMIC
3671 # from here on, everything must be atomic - no thread switch allowed
3672 my $t1 = EV::time;
3224 3673
3225 { 3674 {
3226 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3227 3676
3228 while (my ($face, $info) = each %$faces) { 3677 for my $face (sort keys %$faces) {
3678 my $info = $faces->{$face};
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3680
3231 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3683 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3684 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3235 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3236 cf::cede_to_tick; 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3687 delete $cf::face::META[$idx];
3237 } 3688 }
3238 3689
3239 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3240 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3241 3692
3244 3695
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3696 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3699 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3701 }
3251
3252 cf::cede_to_tick;
3253 } 3702 }
3254 } 3703 }
3255 3704
3256 { 3705 {
3257 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3258 3707
3259 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3260 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3261 cf::cede_to_tick;
3262 } 3710 }
3263 3711
3264 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3265 } 3713 }
3266 3714
3267 { 3715 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3716 my $res = $facedata->{resource};
3271 3717
3272 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3719 if (defined (my $type = $info->{type})) {
3720 # TODO: different hash - must free and use new index, or cache ixface data queue
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3722
3277 if ($info->{type} & 1) {
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3728 $cf::face::HASH{$info->{hash}} = $idx;
3292 } else { 3729 } else {
3293 $RESOURCE{$name} = $info; 3730# $RESOURCE{$name} = $info; # unused
3294 } 3731 }
3295
3296 cf::cede_to_tick;
3297 } 3732 }
3298 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3299 3744
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3746
3747 aio_close $fh if $fh; # close old facedata
3748
3302 1 3749 1
3303} 3750}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3751
3325register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3753 my ($ns, $want) = @_;
3327 3754
3328 while (my ($k, $v) = each %$want) { 3755 while (my ($k, $v) = each %$want) {
3336 my $status = load_resource_file_ $_[0]; 3763 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100; 3764 get_slot 0.1, 100;
3338 cf::arch::commit_load; 3765 cf::arch::commit_load;
3339 3766
3340 $status 3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3341} 3782}
3342 3783
3343sub reload_regions { 3784sub reload_regions {
3344 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3345 # for this (global event?) 3786 # for this (global event?)
3353 if exists $_->{match}; 3794 if exists $_->{match};
3354 } 3795 }
3355} 3796}
3356 3797
3357sub reload_facedata { 3798sub reload_facedata {
3358 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3359 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3360} 3801}
3361 3802
3362sub reload_archetypes { 3803sub reload_archetypes {
3363 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3364 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3806
3807 cf::face::set
3808 "res/skill_info" => FT_RSRC,
3809 JSON::XS->new->utf8->canonical->encode (
3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3365} 3832}
3366 3833
3367sub reload_treasures { 3834sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
3370} 3837}
3371 3838
3839sub reload_sound {
3840 trace "loading sound config from $DATADIR/sound\n";
3841
3842 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3843
3844 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3845 my $sound = $soundconf->{compat}[$_]
3846 or next;
3847
3848 my $face = cf::face::find "sound/$sound->[1]";
3849 cf::sound::set $sound->[0] => $face;
3850 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3851 }
3852
3853 while (my ($k, $v) = each %{$soundconf->{event}}) {
3854 my $face = cf::face::find "sound/$v";
3855 cf::sound::set $k => $face;
3856 }
3857}
3858
3372sub reload_resources { 3859sub reload_resources {
3373 warn "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3374 3861
3862 reload_materials;
3375 reload_facedata; 3863 reload_facedata;
3864 reload_exp_table;
3865 reload_sound;
3376 reload_archetypes; 3866 reload_archetypes;
3377 reload_regions; 3867 reload_regions;
3378 reload_treasures; 3868 reload_treasures;
3379 3869
3380 warn "finished reloading resource files\n"; 3870 trace "finished reloading resource files\n";
3381} 3871}
3382 3872
3383sub reload_config { 3873sub reload_config {
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3874 trace "reloading config file...\n";
3385 or return;
3386 3875
3387 local $/; 3876 my $config = load_file "$CONFDIR/config";
3388 *CFG = YAML::Load <$fh>; 3877 utf8::decode $config;
3878 *CFG = decode_yaml $config;
3389 3879
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3880 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3881
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3882 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3883 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3394 3884
3395 if (exists $CFG{mlockall}) { 3885 if (exists $CFG{mlockall}) {
3419 seek $fh, 0, 0; 3909 seek $fh, 0, 0;
3420 print $fh $$; 3910 print $fh $$;
3421} 3911}
3422 3912
3423sub main_loop { 3913sub main_loop {
3424 warn "EV::loop starting\n"; 3914 trace "EV::loop starting\n";
3425 if (1) { 3915 if (1) {
3426 EV::loop; 3916 EV::loop;
3427 } 3917 }
3428 warn "EV::loop returned\n"; 3918 trace "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP; 3919 goto &main_loop unless $REALLY_UNLOOP;
3430} 3920}
3431 3921
3432sub main { 3922sub main {
3433 cf::init_globals; # initialise logging 3923 cf::init_globals; # initialise logging
3434 3924
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3925 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3926 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3927 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3928 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439 3929
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3930 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446 3931
3447 # we must not ever block the main coroutine 3932 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3933 $Coro::idle = sub {
3449 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3934 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3450 (async { 3935 (async {
3451 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3936 $Coro::current->{desc} = "IDLE BUG HANDLER";
3452 EV::loop EV::LOOP_ONESHOT; 3937 EV::loop EV::LOOP_ONESHOT;
3453 })->prio (Coro::PRIO_MAX); 3938 })->prio (Coro::PRIO_MAX);
3454 }; 3939 };
3455 3940
3456 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3457 3942
3458 cf::sync_job { 3943 cf::sync_job {
3944 cf::incloader::init ();
3945
3946 db_init;
3947
3948 cf::init_anim;
3949 cf::init_attackmess;
3950 cf::init_dynamic;
3951
3952 cf::load_settings;
3953
3459 reload_resources; 3954 reload_resources;
3460 reload_config; 3955 reload_config;
3461 db_init;
3462 3956
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3957 cf::init_uuid;
3466 cf::init_signals; 3958 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3959 cf::init_skills;
3469 3960
3470 cf::init_beforeplay; 3961 cf::init_beforeplay;
3471 3962
3472 atomic; 3963 atomic;
3477 3968
3478 # no (long-running) fork's whatsoever before this point(!) 3969 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX (); 3970 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3971 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481 3972
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3973 cf::_post_init 0;
3483 }; 3974 };
3484 3975
3976 cf::object::thawer::errors_are_fatal 0;
3977 info "parse errors in files are no longer fatal from this point on.\n";
3978
3979 AE::postpone {
3980 undef &main; # free gobs of memory :)
3981 };
3982
3485 main_loop; 3983 goto &main_loop;
3486} 3984}
3487 3985
3488############################################################################# 3986#############################################################################
3489# initialisation and cleanup 3987# initialisation and cleanup
3490 3988
3491# install some emergency cleanup handlers 3989# install some emergency cleanup handlers
3492BEGIN { 3990BEGIN {
3493 our %SIGWATCHER = (); 3991 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3992 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3993 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3994 cf::cleanup "SIG$signal";
3497 }; 3995 };
3498 } 3996 }
3499} 3997}
3500 3998
3501sub write_runtime_sync { 3999sub write_runtime_sync {
4000 my $t0 = AE::time;
4001
3502 # first touch the runtime file to show we are still running: 4002 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 4003 # the fsync below can take a very very long time.
3504 4004
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4005 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 4006
3507 my $guard = cf::lock_acquire "write_runtime"; 4007 my $guard = cf::lock_acquire "write_runtime";
3508 4008
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4009 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 4010 or return;
3511 4011
3512 my $value = $cf::RUNTIME + 90 + 10; 4012 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 4013 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 4014 # 60 allows for the watchdog to kill the server.
3527 or return; 4027 or return;
3528 4028
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4029 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 4030 and return;
3531 4031
3532 warn "runtime file written.\n"; 4032 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 4033
3534 1 4034 1
3535} 4035}
3536 4036
3537our $uuid_lock; 4037our $uuid_lock;
3549 or return; 4049 or return;
3550 4050
3551 my $value = uuid_seq uuid_cur; 4051 my $value = uuid_seq uuid_cur;
3552 4052
3553 unless ($value) { 4053 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n"; 4054 info "cowardly refusing to write zero uuid value!\n";
3555 return; 4055 return;
3556 } 4056 }
3557 4057
3558 my $value = uuid_str $value + $uuid_skip; 4058 my $value = uuid_str $value + $uuid_skip;
3559 $uuid_skip = 0; 4059 $uuid_skip = 0;
3569 or return; 4069 or return;
3570 4070
3571 aio_rename "$uuid~", $uuid 4071 aio_rename "$uuid~", $uuid
3572 and return; 4072 and return;
3573 4073
3574 warn "uuid file written ($value).\n"; 4074 trace "uuid file written ($value).\n";
3575 4075
3576 1 4076 1
3577 4077
3578} 4078}
3579 4079
3585} 4085}
3586 4086
3587sub emergency_save() { 4087sub emergency_save() {
3588 my $freeze_guard = cf::freeze_mainloop; 4088 my $freeze_guard = cf::freeze_mainloop;
3589 4089
3590 warn "emergency_perl_save: enter\n"; 4090 info "emergency_perl_save: enter\n";
4091
4092 # this is a trade-off: we want to be very quick here, so
4093 # save all maps without fsync, and later call a global sync
4094 # (which in turn might be very very slow)
4095 local $USE_FSYNC = 0;
3591 4096
3592 cf::sync_job { 4097 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so 4098 cf::write_runtime_sync; # external watchdog should not bark
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597 4099
3598 # use a peculiar iteration method to avoid tripping on perl 4100 # use a peculiar iteration method to avoid tripping on perl
3599 # refcount bugs in for. also avoids problems with players 4101 # refcount bugs in for. also avoids problems with players
3600 # and maps saved/destroyed asynchronously. 4102 # and maps saved/destroyed asynchronously.
3601 warn "emergency_perl_save: begin player save\n"; 4103 info "emergency_perl_save: begin player save\n";
3602 for my $login (keys %cf::PLAYER) { 4104 for my $login (keys %cf::PLAYER) {
3603 my $pl = $cf::PLAYER{$login} or next; 4105 my $pl = $cf::PLAYER{$login} or next;
3604 $pl->valid or next; 4106 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4107 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3606 $pl->save; 4108 $pl->save;
3607 } 4109 }
3608 warn "emergency_perl_save: end player save\n"; 4110 info "emergency_perl_save: end player save\n";
3609 4111
4112 cf::write_runtime_sync; # external watchdog should not bark
4113
3610 warn "emergency_perl_save: begin map save\n"; 4114 info "emergency_perl_save: begin map save\n";
3611 for my $path (keys %cf::MAP) { 4115 for my $path (keys %cf::MAP) {
3612 my $map = $cf::MAP{$path} or next; 4116 my $map = $cf::MAP{$path} or next;
3613 $map->valid or next; 4117 $map->valid or next;
3614 $map->save; 4118 $map->save;
3615 } 4119 }
3616 warn "emergency_perl_save: end map save\n"; 4120 info "emergency_perl_save: end map save\n";
3617 4121
4122 cf::write_runtime_sync; # external watchdog should not bark
4123
3618 warn "emergency_perl_save: begin database checkpoint\n"; 4124 info "emergency_perl_save: begin database checkpoint\n";
3619 BDB::db_env_txn_checkpoint $DB_ENV; 4125 BDB::db_env_txn_checkpoint $DB_ENV;
3620 warn "emergency_perl_save: end database checkpoint\n"; 4126 info "emergency_perl_save: end database checkpoint\n";
3621 4127
3622 warn "emergency_perl_save: begin write uuid\n"; 4128 info "emergency_perl_save: begin write uuid\n";
3623 write_uuid_sync 1; 4129 write_uuid_sync 1;
3624 warn "emergency_perl_save: end write uuid\n"; 4130 info "emergency_perl_save: end write uuid\n";
4131
4132 cf::write_runtime_sync; # external watchdog should not bark
4133
4134 trace "emergency_perl_save: syncing database to disk";
4135 BDB::db_env_txn_checkpoint $DB_ENV;
4136
4137 info "emergency_perl_save: starting sync\n";
4138 IO::AIO::aio_sync sub {
4139 info "emergency_perl_save: finished sync\n";
4140 };
4141
4142 cf::write_runtime_sync; # external watchdog should not bark
4143
4144 trace "emergency_perl_save: flushing outstanding aio requests";
4145 while (IO::AIO::nreqs || BDB::nreqs) {
4146 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4147 }
4148
4149 cf::write_runtime_sync; # external watchdog should not bark
3625 }; 4150 };
3626 4151
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3632 warn "emergency_perl_save: leave\n"; 4152 info "emergency_perl_save: leave\n";
3633} 4153}
3634 4154
3635sub post_cleanup { 4155sub post_cleanup {
3636 my ($make_core) = @_; 4156 my ($make_core) = @_;
3637 4157
4158 IO::AIO::flush;
4159
3638 warn Carp::longmess "post_cleanup backtrace" 4160 error Carp::longmess "post_cleanup backtrace"
3639 if $make_core; 4161 if $make_core;
3640 4162
3641 my $fh = pidfile; 4163 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$; 4164 unlink $PIDFILE if <$fh> == $$;
3643} 4165}
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4185 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 4186 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 4187 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4188# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 4189 }
3668 warn "cleared package $pkg\n";#d#
3669} 4190}
3670 4191
3671sub do_reload_perl() { 4192sub do_reload_perl() {
3672 # can/must only be called in main 4193 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 4194 unless (in_main) {
3674 warn "can only reload from main coroutine"; 4195 error "can only reload from main coroutine";
3675 return; 4196 return;
3676 } 4197 }
3677 4198
3678 return if $RELOAD++; 4199 return if $RELOAD++;
3679 4200
3680 my $t1 = EV::time; 4201 my $t1 = AE::time;
3681 4202
3682 while ($RELOAD) { 4203 while ($RELOAD) {
3683 warn "reloading..."; 4204 cf::get_slot 0.1, -1, "reload_perl";
4205 info "perl_reload: reloading...";
3684 4206
3685 warn "entering sync_job"; 4207 trace "perl_reload: entering sync_job";
3686 4208
3687 cf::sync_job { 4209 cf::sync_job {
3688 cf::write_runtime_sync; # external watchdog should not bark
3689 cf::emergency_save; 4210 #cf::emergency_save;
3690 cf::write_runtime_sync; # external watchdog should not bark
3691 4211
3692 warn "syncing database to disk";
3693 BDB::db_env_txn_checkpoint $DB_ENV;
3694
3695 # if anything goes wrong in here, we should simply crash as we already saved
3696
3697 warn "flushing outstanding aio requests";
3698 while (IO::AIO::nreqs || BDB::nreqs) {
3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3700 }
3701
3702 warn "cancelling all extension coros"; 4212 trace "perl_reload: cancelling all extension coros";
3703 $_->cancel for values %EXT_CORO; 4213 $_->cancel for values %EXT_CORO;
3704 %EXT_CORO = (); 4214 %EXT_CORO = ();
3705 4215
3706 warn "removing commands"; 4216 trace "perl_reload: removing commands";
3707 %COMMAND = (); 4217 %COMMAND = ();
3708 4218
3709 warn "removing ext/exti commands"; 4219 trace "perl_reload: removing ext/exti commands";
3710 %EXTCMD = (); 4220 %EXTCMD = ();
3711 %EXTICMD = (); 4221 %EXTICMD = ();
3712 4222
3713 warn "unloading/nuking all extensions"; 4223 trace "perl_reload: unloading/nuking all extensions";
3714 for my $pkg (@EXTS) { 4224 for my $pkg (@EXTS) {
3715 warn "... unloading $pkg"; 4225 trace "... unloading $pkg";
3716 4226
3717 if (my $cb = $pkg->can ("unload")) { 4227 if (my $cb = $pkg->can ("unload")) {
3718 eval { 4228 eval {
3719 $cb->($pkg); 4229 $cb->($pkg);
3720 1 4230 1
3721 } or warn "$pkg unloaded, but with errors: $@"; 4231 } or error "$pkg unloaded, but with errors: $@";
3722 } 4232 }
3723 4233
3724 warn "... clearing $pkg"; 4234 trace "... clearing $pkg";
3725 clear_package $pkg; 4235 clear_package $pkg;
3726 } 4236 }
3727 4237
3728 warn "unloading all perl modules loaded from $LIBDIR"; 4238 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) { 4239 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4240 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731 4241
3732 warn "... unloading $k"; 4242 trace "... unloading $k";
3733 delete $INC{$k}; 4243 delete $INC{$k};
3734 4244
3735 $k =~ s/\.pm$//; 4245 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g; 4246 $k =~ s/\//::/g;
3737 4247
3740 } 4250 }
3741 4251
3742 clear_package $k; 4252 clear_package $k;
3743 } 4253 }
3744 4254
3745 warn "getting rid of safe::, as good as possible"; 4255 trace "perl_reload: getting rid of safe::, as good as possible";
3746 clear_package "safe::$_" 4256 clear_package "safe::$_"
3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4257 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3748 4258
3749 warn "unloading cf.pm \"a bit\""; 4259 trace "perl_reload: unloading cf.pm \"a bit\"";
3750 delete $INC{"cf.pm"}; 4260 delete $INC{"cf.pm"};
3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4261 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3752 4262
3753 # don't, removes xs symbols, too, 4263 # don't, removes xs symbols, too,
3754 # and global variables created in xs 4264 # and global variables created in xs
3755 #clear_package __PACKAGE__; 4265 #clear_package __PACKAGE__;
3756 4266
3757 warn "unload completed, starting to reload now"; 4267 info "perl_reload: unload completed, starting to reload now";
3758 4268
3759 warn "reloading cf.pm"; 4269 trace "perl_reload: reloading cf.pm";
3760 require cf; 4270 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4271 cf::_connect_to_perl_1;
3762 4272
3763 warn "loading config and database again"; 4273 trace "perl_reload: loading config and database again";
3764 cf::reload_config; 4274 cf::reload_config;
3765 4275
3766 warn "loading extensions"; 4276 trace "perl_reload: loading extensions";
3767 cf::load_extensions; 4277 cf::load_extensions;
3768 4278
3769 if ($REATTACH_ON_RELOAD) { 4279 if ($REATTACH_ON_RELOAD) {
3770 warn "reattaching attachments to objects/players"; 4280 trace "perl_reload: reattaching attachments to objects/players";
3771 _global_reattach; # objects, sockets 4281 _global_reattach; # objects, sockets
3772 warn "reattaching attachments to maps"; 4282 trace "perl_reload: reattaching attachments to maps";
3773 reattach $_ for values %MAP; 4283 reattach $_ for values %MAP;
3774 warn "reattaching attachments to players"; 4284 trace "perl_reload: reattaching attachments to players";
3775 reattach $_ for values %PLAYER; 4285 reattach $_ for values %PLAYER;
3776 } 4286 }
3777 4287
3778 warn "running post_init jobs"; 4288 cf::_post_init 1;
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780 4289
3781 warn "leaving sync_job"; 4290 trace "perl_reload: leaving sync_job";
3782 4291
3783 1 4292 1
3784 } or do { 4293 } or do {
3785 warn $@; 4294 error $@;
3786 cf::cleanup "error while reloading, exiting."; 4295 cf::cleanup "perl_reload: error, exiting.";
3787 }; 4296 };
3788 4297
3789 warn "reloaded";
3790 --$RELOAD; 4298 --$RELOAD;
3791 } 4299 }
3792 4300
3793 $t1 = EV::time - $t1; 4301 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 4302 info "perl_reload: completed in ${t1}s\n";
3795}; 4303};
3796 4304
3797our $RELOAD_WATCHER; # used only during reload 4305our $RELOAD_WATCHER; # used only during reload
3798 4306
3799sub reload_perl() { 4307sub reload_perl() {
3801 # coro crashes during coro_state_free->destroy here. 4309 # coro crashes during coro_state_free->destroy here.
3802 4310
3803 $RELOAD_WATCHER ||= cf::async { 4311 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 4312 Coro::AIO::aio_wait cache_extensions;
3805 4313
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4314 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 4315 do_reload_perl;
3808 undef $RELOAD_WATCHER; 4316 undef $RELOAD_WATCHER;
3809 }; 4317 };
3810 }; 4318 };
3811} 4319}
3820 reload_perl; 4328 reload_perl;
3821 }; 4329 };
3822 } 4330 }
3823}; 4331};
3824 4332
3825unshift @INC, $LIBDIR; 4333#############################################################################
3826 4334
3827my $bug_warning = 0; 4335my $bug_warning = 0;
3828 4336
3829our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN;
3831
3832sub wait_for_tick { 4337sub wait_for_tick() {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 4338 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3834 4339
3835 my $signal = new Coro::Signal; 4340 $WAIT_FOR_TICK->wait;
3836 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait;
3838} 4341}
3839 4342
3840sub wait_for_tick_begin { 4343sub wait_for_tick_begin() {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3842 4345
3843 my $signal = new Coro::Signal; 4346 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 4347 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 4348 $signal->wait;
3846} 4349}
3850 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4353 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3851 unless ++$bug_warning > 10; 4354 unless ++$bug_warning > 10;
3852 return; 4355 return;
3853 } 4356 }
3854 4357
3855 cf::server_tick; # one server iteration 4358 cf::one_tick; # one server iteration
4359
4360 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3856 4361
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4363 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 4364 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 4365 $Coro::current->{desc} = "runtime saver";
3861 write_runtime_sync 4366 write_runtime_sync
3862 or warn "ERROR: unable to write runtime file: $!"; 4367 or error "ERROR: unable to write runtime file: $!";
3863 }; 4368 };
3864 } 4369 }
3865 4370
3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4371 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3867 $sig->send; 4372 $sig->send;
3868 } 4373 }
3869 while (my $sig = shift @WAIT_FOR_TICK) { 4374 $WAIT_FOR_TICK->broadcast;
3870 $sig->send;
3871 }
3872 4375
3873 $LOAD = ($NOW - $TICK_START) / $TICK; 4376 $LOAD = ($NOW - $TICK_START) / $TICK;
3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4377 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3875 4378
3876 if (0) { 4379 if (0) {
3877 if ($NEXT_TICK) { 4380 if ($NEXT_TICK) {
3878 my $jitter = $TICK_START - $NEXT_TICK; 4381 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4382 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d# 4383 debug "jitter $JITTER\n";#d#
3881 } 4384 }
3882 } 4385 }
3883} 4386}
3884 4387
3885{ 4388{
3886 # configure BDB 4389 # configure BDB
4390 info "initialising database";
3887 4391
3888 BDB::min_parallel 8; 4392 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
3891 4395
3892 unless ($DB_ENV) { 4396 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4397 $DB_ENV = BDB::db_env_create;
3894 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4398 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3895 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4399 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3920 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3921 }; 4425 };
3922 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3923 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3924 }; 4428 };
4429
4430 info "database initialised";
3925} 4431}
3926 4432
3927{ 4433{
3928 # configure IO::AIO 4434 # configure IO::AIO
3929 4435
4436 info "initialising aio";
3930 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
3931 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
3932 undef $AnyEvent::AIO::WATCHER; 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
3933} 4441}
3934 4442
3935my $_log_backtrace; 4443our $_log_backtrace;
4444our $_log_backtrace_last;
3936 4445
3937sub _log_backtrace { 4446sub _log_backtrace {
3938 my ($msg, @addr) = @_; 4447 my ($msg, @addr) = @_;
3939 4448
3940 $msg =~ s/\n//; 4449 $msg =~ s/\n$//;
3941 4450
4451 if ($_log_backtrace_last eq $msg) {
4452 LOG llevInfo, "[ABT] $msg\n";
4453 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3942 # limit the # of concurrent backtraces 4454 # limit the # of concurrent backtraces
3943 if ($_log_backtrace < 2) { 4455 } elsif ($_log_backtrace < 2) {
4456 $_log_backtrace_last = $msg;
3944 ++$_log_backtrace; 4457 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg; 4458 my $perl_bt = Carp::longmess $msg;
3946 async { 4459 async {
3947 $Coro::current->{desc} = "abt $msg"; 4460 $Coro::current->{desc} = "abt $msg";
3948 4461
3968 LOG llevInfo, "[ABT] $_\n" for @bt; 4481 LOG llevInfo, "[ABT] $_\n" for @bt;
3969 --$_log_backtrace; 4482 --$_log_backtrace;
3970 }; 4483 };
3971 } else { 4484 } else {
3972 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $msg\n";
3973 LOG llevInfo, "[ABT] [suppressed]\n"; 4486 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3974 } 4487 }
3975} 4488}
3976 4489
3977# load additional modules 4490# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4491require "cf/$_.pm" for @EXTRA_MODULES;
4492cf::_connect_to_perl_2;
3979 4493
3980END { cf::emergency_save } 4494END { cf::emergency_save }
3981 4495
39821 44961
3983 4497

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines