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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 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 "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; 63use Time::HiRes;
61use Compress::LZF; 64use Compress::LZF;
62use Digest::MD5 (); 65use Digest::MD5 ();
63 66
72 75
73# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
78 86
79our %COMMAND = (); 87our %COMMAND = ();
80our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
81 89
82our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
84our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
87 97
88our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
90 102
91our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
92our $DATADIR = datadir; 105our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
96our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 118
105our %RESOURCE; 119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
106 126
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 129our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
111 131
112our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 135our $DB_ENV;
116 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
117our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
118 141
119our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
121our $NOW; 145our $NOW;
122 146
123our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 156our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
134 158
135our @POST_INIT; 159our @POST_INIT;
136 160
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
138 166
139binmode STDOUT; 167binmode STDOUT;
140binmode STDERR; 168binmode STDERR;
141 169
142# read virtual server time, if available 170# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 172 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
147} 175}
148 176
177eval "sub TICK() { $TICK } 1" or die;
178
149mkdir $_ 179mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 181
152our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
153 183
154sub cf::map::normalise; 184sub cf::map::normalise;
155 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
156############################################################################# 190#############################################################################
157 191
192%REFLECT = ();
193for (@REFLECT) {
194 my $reflect = JSON::XS::decode_json $_;
195 $REFLECT{$reflect->{class}} = $reflect;
196}
197
198# this is decidedly evil
199$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
200
201#############################################################################
202
158=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
159 204
160=over 4 205=over 4
161 206
162=item $cf::UPTIME 207=item $cf::UPTIME
163 208
164The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
165 225
166=item $cf::RUNTIME 226=item $cf::RUNTIME
167 227
168The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
169every server tick. 229every server tick.
170 230
171=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
172$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
173$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
174 234
175Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
178database environment. 238database environment.
179 239
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 240=item $cf::LOADAVG
189 241
190The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
191(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
192objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
201from wherever your confdir points to. 253from wherever your confdir points to.
202 254
203=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
204 256
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 258returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 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();
277
209=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
210 279
211This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 282that call.
214 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
215=back 290=back
216 291
217=cut 292=cut
218 293
219BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 301 my $msg = join "", @_;
222 302
223 $msg .= "\n" 303 $msg .= "\n"
224 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
225 305
226 $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;
227 307
228 LOG llevError, $msg; 308 LOG llevWarn, $msg;
229 }; 309};
230}
231 310
232$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
234 313
235 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 318 return;#d#
238 }#d# 319 }#d#
239 320
240 # kill coroutine otherwise 321 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 322 Coro::terminate
243}; 323};
244
245$SIG{__DIE__} = sub { }; #d#?
246 324
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 342)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 344}
267 345
268$EV::DIED = sub { 346$EV::DIED = sub {
269 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
270}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
271 354
272############################################################################# 355#############################################################################
273 356
274=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
275 358
296 $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;
297 $d 380 $d
298 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
299} 382}
300 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
301=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
302 437
303Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
304 439
305=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
311our $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
312 447
313sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
317 483
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
320 486
321The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 488is a reload or not.
323 489
324=cut 490=cut
325 491
326sub post_init(&) { 492sub post_init(&) {
327 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 }
328} 511}
329 512
330=item cf::lock_wait $string 513=item cf::lock_wait $string
331 514
332Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
371} 554}
372 555
373=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
374 557
375Like 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
376get spread over timer. 559get spread over time.
377 560
378=cut 561=cut
379 562
380sub periodic($$) { 563sub periodic($$) {
381 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
386} 569}
387 570
388=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
389 572
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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 les than zero, interactive jobs
579should use 100 or more.
393 580
394The 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
395used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
396 583
397Useful for short background jobs. 584Useful for short background jobs.
398 585
399=cut 586=cut
400 587
401our @SLOT_QUEUE; 588our @SLOT_QUEUE;
402our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
403 591
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
407 595
408 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
409 598
410 while () { 599 while () {
411 next_job: 600 next_job:
601
412 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 603
414 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 608 $job->[2]->send;
418 Coro::cede; 609 Coro::cede;
419 goto next_job; 610 goto next_job;
420 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 613 }
422 } 614 }
423 615
424 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 619 } else {
620 $busy = 0;
429 Coro::schedule; 621 Coro::schedule;
430 } 622 }
431 } 623 }
432}; 624};
433 625
434sub get_slot($;$$) { 626sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
436 628
437 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
438 630
439 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
440 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
441 634
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
470=cut 663=cut
471 664
472sub sync_job(&) { 665sub sync_job(&) {
473 my ($job) = @_; 666 my ($job) = @_;
474 667
475 if ($Coro::current == $Coro::main) { 668 if (in_main) {
476 my $time = EV::time; 669 my $time = AE::time;
477 670
478 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
480 673
481 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
482 675
483 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
484 677
485 my $busy = 1; 678 my $busy = 1;
486 my @res; 679 my @res;
487 680
488 (async { 681 (async {
489 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 683 @res = eval { $job->() };
491 warn $@ if $@; 684 error $@ if $@;
492 undef $busy; 685 undef $busy;
493 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
494 687
495 while ($busy) { 688 while ($busy) {
496 if (Coro::nready) { 689 if (Coro::nready) {
498 } else { 691 } else {
499 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
500 } 693 }
501 } 694 }
502 695
503 my $time = EV::time - $time; 696 my $time = AE::time - $time;
504 697
505 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
506 699
507 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
508 } else { 701 } else {
530 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
531 724
532 $coro 725 $coro
533} 726}
534 727
535=item fork_call { }, $args 728=item fork_call { }, @args
536 729
537Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 733never block itself or use any form of event handling.
541 734
542=cut 735=cut
543 736
737sub post_fork {
738 reset_signals;
739}
740
544sub fork_call(&@) { 741sub fork_call(&@) {
545 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
546 743
547 # we seemingly have to make a local copy of the whole thing, 744 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
550 747
551 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
552 reset_signals; 749 cf::post_fork;
553 &$cb 750 &$cb
554 }, @args; 751 } @args;
555 752
556 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
557} 765}
558 766
559=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
560 768
561=cut 769=cut
598within each server. 806within each server.
599 807
600=cut 808=cut
601 809
602sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
603 my ($name) = @_; 814 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
605 816
606 eval { 817 eval {
607 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
617} 828}
618 829
619our $DB; 830our $DB;
620 831
621sub db_init { 832sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
624 };
625} 834}
626 835
627sub db_get($$) { 836sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
629 838
630 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
631 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
632 843
633 $! ? () 844 $! ? ()
634 : $data 845 : $data
635 }
636} 846}
637 847
638sub db_put($$$) { 848sub db_put($$$) {
639 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 878
669 my @data; 879 my @data;
670 my $md5; 880 my $md5;
671 881
672 for (0 .. $#$src) { 882 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 884 }
676 885
677 # if processing is expensive, check 886 # if processing is expensive, check
678 # checksum first 887 # checksum first
679 if (1) { 888 if (1) {
696 905
697 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 907 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
700 909
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 911
703 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
706 915
716 925
717=cut 926=cut
718 927
719sub datalog($@) { 928sub datalog($@) {
720 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 931}
723 932
724=back 933=back
725 934
726=cut 935=cut
921 1130
922 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1133
925 } elsif (ref $type) { 1134 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
927 1136
928 } else { 1137 } else {
929 shift @arg; 1138 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
931 } 1140 }
932 } 1141 }
933} 1142}
934 1143
935sub _object_attach { 1144sub _object_attach {
945 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
946 } 1155 }
947 1156
948 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
949 } else { 1158 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1160 }
952 1161
953 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
954} 1163}
955 1164
1014 1223
1015 for (@$callbacks) { 1224 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1017 1226
1018 if ($@) { 1227 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1229 override;
1022 } 1230 }
1023 1231
1024 return 1 if $override; 1232 return 1 if $override;
1025 } 1233 }
1104 for (@$attach) { 1312 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1107 } 1315 }
1108 } else { 1316 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1318 }
1111 } 1319 }
1112} 1320}
1113 1321
1114cf::attachable->attach ( 1322cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1142 1350
1143 sync_job { 1351 sync_job {
1144 if (length $$rdata) { 1352 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1148 1357
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1361 if ($cf::USE_FSYNC) {
1362 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1363 aio_fsync $fh;
1364 }
1153 aio_close $fh; 1365 aio_close $fh;
1154 1366
1155 if (@$objs) { 1367 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1368 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1374 aio_fsync $fh;
1375 }
1161 aio_close $fh; 1376 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1378 }
1164 } else { 1379 } else {
1165 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1169 1384
1170 $filename =~ s%/[^/]+$%%; 1385 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1386 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1387 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1174 } 1389 }
1175 } else { 1390 } else {
1176 aio_unlink $filename; 1391 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1178 } 1393 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1418 $av = $st->{objs};
1204 } 1419 }
1205 1420
1206 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1209 1425
1210 ($data, $av) 1426 ($data, $av)
1211} 1427}
1212 1428
1213=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1217=cut 1433=cut
1218 1434
1219############################################################################# 1435#############################################################################
1220# command handling &c 1436# command handling &c
1221 1437
1222=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1223 1439
1224Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1225$name. 1441$name.
1226 1442
1227=cut 1443=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1234 1450
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1452}
1237 1453
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1455
1240Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully. 1460has logged in successfully.
1245 1461
1246If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1247called.
1248 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1470
1251Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1253are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1254is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1255log-in. 1475log-in.
1256 1476
1257If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1258called.
1259 1478
1260=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1262sub register_extcmd { 1486sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1264 1488
1265 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1266} 1490}
1267 1491
1268sub register_exticmd { 1492sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1270 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1271 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1272} 1502}
1273 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1274use File::Glob (); 1510use File::Glob ();
1275 1511
1276cf::player->attach ( 1512cf::player->attach (
1277 on_command => sub { 1513 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1279 1515
1280 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1281 or return; 1517 or return;
1282 1518
1290 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1291 1527
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1529
1294 if (ref $msg) { 1530 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1532
1300 my @reply;
1301
1302 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1303 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1304 } 1551 }
1305 1552
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1309 } else { 1553 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1555 }
1312 1556
1313 cf::override; 1557 cf::override;
1314 }, 1558 },
1315); 1559);
1316 1560
1317# "readahead" all extensions 1561# "readahead" all extensions
1318sub cache_extensions { 1562sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1563 my $grp = IO::AIO::aio_group;
1320 1564
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1565 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1566 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1567 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1568 }
1325 }; 1569 };
1326 1570
1327 $grp 1571 $grp
1328} 1572}
1329 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1330sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1331 cf::sync_job { 1590 cf::sync_job {
1332 my %todo; 1591 my %todo;
1333 1592
1334 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1594 next unless -r $path;
1353 1612
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1615
1357 $ext{source} = 1616 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1360 . $source 1619 . $source
1361 . "\n};\n1"; 1620 . "\n};\n1";
1362 1621
1363 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1364 } 1623 }
1365 1624
1625 my $pass = 0;
1366 my %done; 1626 my %done;
1367 while (%todo) { 1627 while (%todo) {
1368 my $progress; 1628 my $progress;
1369 1629
1630 ++$pass;
1631
1632 ext:
1370 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1635 next ext
1373 unless exists $done{$_}; 1636 unless exists $done{$_};
1374 } 1637 }
1375 1638
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1640
1378 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1654
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1656 if exists $v->{meta}{mandatory};
1386 1657
1387 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1388 } 1667 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1668 }
1394 1669
1395 skip: 1670 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1398 } 1680 }
1399 }; 1681 };
1400} 1682}
1401 1683
1402############################################################################# 1684#############################################################################
1486 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1487 } 1769 }
1488 } 1770 }
1489} 1771}
1490 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1491sub save($) { 1786sub save($) {
1492 my ($pl) = @_; 1787 my ($pl) = @_;
1493 1788
1494 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1495 1790
1500 1795
1501 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1503 1798
1504 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1803
1506 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1805 cf::cede_to_tick;
1508} 1806}
1509 1807
1543 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1544 1842
1545 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1845
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1847 $pl->deactivate;
1848
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1553 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1554 1854
1555 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1611 \@logins 1911 \@logins
1612} 1912}
1613 1913
1614=item $player->maps 1914=item $player->maps
1615 1915
1916=item cf::player::maps $login
1917
1616Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1617player. May block. 1919player. May block.
1618 1920
1619=cut 1921=cut
1620 1922
1641 1943
1642=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643 1945
1644Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1645 1947
1646=item $player->ext_reply ($msgid, @msg)
1647
1648Sends an ext reply to the player.
1649
1650=cut
1651
1652sub ext_reply($$@) {
1653 my ($self, $id, @msg) = @_;
1654
1655 $self->ns->ext_reply ($id, @msg)
1656}
1657
1658=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1659 1949
1660Sends an ext event to the client. 1950Sends an ext event to the client.
1661 1951
1662=cut 1952=cut
1681 1971
1682=cut 1972=cut
1683 1973
1684sub find_by_path($) { 1974sub find_by_path($) {
1685 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1686 1978
1687 my ($match, $specificity); 1979 my ($match, $specificity);
1688 1980
1689 for my $region (list) { 1981 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1719sub generate_random_map { 2011sub generate_random_map {
1720 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1721 2013
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 2015
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 2017}
1739 2018
1740=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1741 2020
1742Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1747 2026
1748sub register { 2027sub register {
1749 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 2029 my $pkg = caller;
1751 2030
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 2032
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 2034}
1757 2035
1758# also paths starting with '/' 2036# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 2038
1761sub thawer_merge { 2039sub thawer_merge {
1762 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1763 2041
1764 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1769} 2047}
1770 2048
1771sub normalise { 2049sub normalise {
1772 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1773 2051
1774 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1775 2053
1776 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1777 2055
1778 # map plan: 2056 # map plan:
1779 # 2057 #
1794 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2073 $path = "$base/$path";
1796 } 2074 }
1797 2075
1798 for ($path) { 2076 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1802 } 2079 }
1803 2080
1804 $path 2081 $path
1818 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1819 return $self; 2096 return $self;
1820 } 2097 }
1821 } 2098 }
1822 2099
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2101 ()
1825} 2102}
1826 2103
2104# may re-bless or do other evil things
1827sub init { 2105sub init {
1828 my ($self) = @_; 2106 my ($self) = @_;
1829 2107
1830 $self 2108 $self
1831} 2109}
1896 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1897 2175
1898 1 2176 1
1899} 2177}
1900 2178
2179# used to laod the header of an original map
1901sub load_header_orig { 2180sub load_header_orig {
1902 my ($self) = @_; 2181 my ($self) = @_;
1903 2182
1904 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1905} 2184}
1906 2185
2186# used to laod the header of an instantiated map
1907sub load_header_temp { 2187sub load_header_temp {
1908 my ($self) = @_; 2188 my ($self) = @_;
1909 2189
1910 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1911} 2191}
1912 2192
2193# called after loading the header from an instantiated map
1913sub prepare_temp { 2194sub prepare_temp {
1914 my ($self) = @_; 2195 my ($self) = @_;
1915 2196
1916 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1918 # safety 2199 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2202}
1922 2203
2204# called after loading the header from an original map
1923sub prepare_orig { 2205sub prepare_orig {
1924 my ($self) = @_; 2206 my ($self) = @_;
1925 2207
1926 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1951 2233
1952sub find; 2234sub find;
1953sub find { 2235sub find {
1954 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1955 2237
2238 cf::cede_to_tick;
2239
1956 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1957 2241
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2244
1961 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
1978 2262
1979 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
1980 } 2264 }
1981} 2265}
1982 2266
1983sub pre_load { } 2267sub pre_load { }
1984sub post_load { } 2268#sub post_load { } # XS
1985 2269
1986sub load { 2270sub load {
1987 my ($self) = @_; 2271 my ($self) = @_;
1988 2272
1989 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
1992 2276
1993 { 2277 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
1995 2279
1996 return unless $self->valid; 2280 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2282
2001 $self->alloc; 2283 $self->alloc;
2002 2284
2003 $self->pre_load; 2285 $self->pre_load;
2004 cf::cede_to_tick; 2286 cf::cede_to_tick;
2005 2287
2288 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2290 $f->skip_block;
2008 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2009 or return; 2292 or return;
2010 2293
2011 $self->post_load_original 2294 $self->post_load_original
2012 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2013 2296
2014 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2298 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2301 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2021 } 2305 }
2022 } 2306 }
2023 }
2024 2307
2025 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2026 2315
2027 cf::cede_to_tick; 2316 cf::cede_to_tick;
2028 # now do the right thing for maps 2317 # now do the right thing for maps
2029 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2324 $self->decay_objects;
2036 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2037 $self->update_buttons; 2326 $self->update_buttons;
2038 cf::cede_to_tick; 2327 cf::cede_to_tick;
2039 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2040 } 2329 }
2041 2330
2042 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2333 }
2047 2334
2048 $self->post_load; 2335 $self->post_load;
2049}
2050 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2051sub customise_for { 2343sub customise_for {
2052 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2053 2345
2054 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2347 if $self->per_player;
2058# if $self->per_party; 2350# if $self->per_party;
2059 2351
2060 $self 2352 $self
2061} 2353}
2062 2354
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2355sub find_sync {
2090 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2091 2357
2092 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2093} 2363}
2094 2364
2095sub do_load_sync { 2365sub do_load_sync {
2096 my ($map) = @_; 2366 my ($map) = @_;
2097 2367
2368 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2100 2371
2101 cf::sync_job { $map->load }; 2372 $map->load;
2102} 2373}
2103 2374
2104our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2106 2377
2107sub find_async { 2378sub find_async {
2108 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2109 2380
2110 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2111 2382
2112 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2114 } 2385 }
2115 2386
2116 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2117 2388
2118 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2132 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2133 2404
2134 () 2405 ()
2135} 2406}
2136 2407
2408# common code, used by both ->save and ->swapout
2137sub save { 2409sub _save {
2138 my ($self) = @_; 2410 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2411
2142 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2143 2413
2144 return unless $self->dirty; 2414 return unless $self->dirty;
2145 2415
2165 } else { 2435 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2437 }
2168} 2438}
2169 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2170sub swap_out { 2448sub swap_out {
2171 my ($self) = @_; 2449 my ($self) = @_;
2172 2450
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2178 return if $self->players; 2455 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2180 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2181 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2182 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2183 2507
2184 $self->deactivate; 2508 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2510 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2511
2232 $self->unlink_save; 2512 $self->unlink_save;
2233 $self->destroy; 2513 $self->destroy;
2234} 2514}
2235 2515
2243 2523
2244 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2245 2525
2246 $self->unlink_save; 2526 $self->unlink_save;
2247 2527
2248 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2533
2310 : normalise $_ 2590 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2592 ]
2313} 2593}
2314 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2315=back 2627=back
2316 2628
2317=head3 cf::object 2629=head3 cf::object
2318 2630
2319=cut 2631=cut
2384 2696
2385our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2386 id => "say", 2698 id => "say",
2387 title => "Map", 2699 title => "Map",
2388 reply => "say ", 2700 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2701 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2702};
2391 2703
2392our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2393 id => "chat", 2705 id => "chat",
2394 title => "Chat", 2706 title => "Chat",
2451 2763
2452Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2453 2765
2454The player should be reasonably safe there for short amounts of time (e.g. 2766The player should be reasonably safe there for short amounts of time (e.g.
2455for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link 2768though, as the player cannot control the character while it is on the link
2457map. 2769map.
2458 2770
2459Will never block. 2771Will never block.
2460 2772
2461=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2483 my ($self) = @_; 2795 my ($self) = @_;
2484 2796
2485 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2486 2798
2799 ++$self->{_link_recursion};
2800
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2802
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2491 2805
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2807}
2494 2808
2495sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2497 2811
2514 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2516 2830
2517 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2520 2834
2521 $map->load; 2835 $map->load;
2522 $map->load_neighbours;
2523 2836
2524 return unless $self->contr->active; 2837 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2838
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2530} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2531 2846
2847}
2848
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2850
2534Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2544 2861
2545our $GOTOGEN; 2862our $GOTOGEN;
2546 2863
2547sub cf::object::player::goto { 2864sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2549 2872
2550 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2875
2553 $self->enter_link; 2876 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2574 } 2897 }
2575 } 2898 }
2576 2899
2577 my $map = eval { 2900 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2902
2580 if ($map) { 2903 if ($map) {
2581 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2906 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2908 }
2586 2909
2587 $map 2910 $map
2595 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2598 } 2921 }
2599 2922
2600 $done->() if $done; 2923 $done->($self) if $done;
2601 })->prio (1); 2924 })->prio (1);
2602} 2925}
2603 2926
2604=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2605 2928
2673 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2674 2997
2675 unless (eval { 2998 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2677 3000
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2689 3027
2690 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2691 3029
2692 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2702 3040
2703 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 3042 $self->leave_link;
2705 } 3043 }
2706 })->prio (1); 3044 })->prio (1);
2707} 3045}
2708 3046
2720sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2722 3060
2723 utf8::encode $text; 3061 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2725} 3088}
2726 3089
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3091
2729Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2733 3096
2734=cut 3097=cut
2735 3098
2736# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2738 "c/identify" => { 3107 "c/identify" => {
2739 id => "infobox", 3108 id => "infobox",
2740 title => "Identify", 3109 title => "Identify",
2741 reply => undef, 3110 reply => undef,
2742 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2744 "c/examine" => { 3113 "c/examine" => {
2745 id => "infobox", 3114 id => "infobox",
2746 title => "Examine", 3115 title => "Examine",
2747 reply => undef, 3116 reply => undef,
2748 tooltip => "Signs and other items you examined", 3117 tooltip => "Signs and other items you examined",
3118 },
3119 "c/shopinfo" => {
3120 id => "infobox",
3121 title => "Shop Info",
3122 reply => undef,
3123 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 3124 },
2750 "c/book" => { 3125 "c/book" => {
2751 id => "infobox", 3126 id => "infobox",
2752 title => "Book", 3127 title => "Book",
2753 reply => undef, 3128 reply => undef,
2769 id => "infobox", 3144 id => "infobox",
2770 title => "Body Parts", 3145 title => "Body Parts",
2771 reply => undef, 3146 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2773 }, 3148 },
3149 "c/statistics" => {
3150 id => "infobox",
3151 title => "Statistics",
3152 reply => undef,
3153 tooltip => "Shows your primary statistics",
3154 },
2774 "c/skills" => { 3155 "c/skills" => {
2775 id => "infobox", 3156 id => "infobox",
2776 title => "Skills", 3157 title => "Skills",
2777 reply => undef, 3158 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3159 tooltip => "Shows your experience per skill and item power",
3160 },
3161 "c/shopitems" => {
3162 id => "infobox",
3163 title => "Shop Items",
3164 reply => undef,
3165 tooltip => "Shows the items currently for sale in this shop",
3166 },
3167 "c/resistances" => {
3168 id => "infobox",
3169 title => "Resistances",
3170 reply => undef,
3171 tooltip => "Shows your resistances",
3172 },
3173 "c/pets" => {
3174 id => "infobox",
3175 title => "Pets",
3176 reply => undef,
3177 tooltip => "Shows information abotu your pets/a specific pet",
3178 },
3179 "c/perceiveself" => {
3180 id => "infobox",
3181 title => "Perceive Self",
3182 reply => undef,
3183 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3184 },
2780 "c/uptime" => { 3185 "c/uptime" => {
2781 id => "infobox", 3186 id => "infobox",
2782 title => "Uptime", 3187 title => "Uptime",
2783 reply => undef, 3188 reply => undef,
2793 id => "party", 3198 id => "party",
2794 title => "Party", 3199 title => "Party",
2795 reply => "gsay ", 3200 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2797 }, 3202 },
3203 "c/death" => {
3204 id => "death",
3205 title => "Death",
3206 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death",
3208 },
2798 "c/say" => $SAY_CHANNEL, 3209 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3210 "c/chat" => $CHAT_CHANNEL,
2800); 3211);
2801 3212
2802sub cf::client::send_msg { 3213sub cf::client::send_msg {
2833 my $pkt = "msg " 3244 my $pkt = "msg "
2834 . $self->{json_coder}->encode ( 3245 . $self->{json_coder}->encode (
2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2836 ); 3247 );
2837 3248
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if (8192 < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt); 3249 $self->send_big_packet ($pkt);
2849} 3250}
2850 3251
2851=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2852 3253
2853Sends an ext event to the client. 3254Sends an ext event to the client.
2855=cut 3256=cut
2856 3257
2857sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2858 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2859 3260
2860 if ($self->extcmd == 2) {
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2862 } elsif ($self->extcmd == 1) { # TODO: remove
2863 push @msg, msgtype => "event_$type";
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2865 }
2866}
2867
2868=item $client->ext_reply ($msgid, @msg)
2869
2870Sends an ext reply to the client.
2871
2872=cut
2873
2874sub cf::client::ext_reply($$@) {
2875 my ($self, $id, @msg) = @_;
2876
2877 if ($self->extcmd == 2) {
2878 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2879 } elsif ($self->extcmd == 1) {
2880 #TODO: version 1, remove
2881 unshift @msg, msgtype => "reply", msgid => $id;
2882 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2883 }
2884} 3262}
2885 3263
2886=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2887 3265
2888Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
2943 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
2944 3322
2945 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2946 3324
2947 if (ref $msg) { 3325 if (ref $msg) {
2948 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2949 "ARRAY" eq ref $msg
2950 ? @$msg
2951 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2952 3327
2953 my @reply;
2954
2955 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
2956 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
2957 } 3346 }
2958
2959 $ns->ext_reply ($reply, @reply)
2960 if $reply;
2961
2962 } else { 3347 } else {
2963 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2964 } 3349 }
2965 3350
2966 cf::override; 3351 cf::override;
2967 }, 3352 },
2968); 3353);
2988 3373
2989 $coro 3374 $coro
2990} 3375}
2991 3376
2992cf::client->attach ( 3377cf::client->attach (
2993 on_destroy => sub { 3378 on_client_destroy => sub {
2994 my ($ns) = @_; 3379 my ($ns) = @_;
2995 3380
2996 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2997 }, 3382 },
2998); 3383);
3014our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3015 3400
3016$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3017 3402
3018$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3019 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3020 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3021 sort time 3406 sort time
3022)); 3407));
3023 3408
3024# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3028The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3029 3414
3030 cf::object 3415 cf::object
3031 contr pay_amount pay_player map x y force_find force_add destroy 3416 contr pay_amount pay_player map x y force_find force_add destroy
3032 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3033 3419
3034 cf::object::player 3420 cf::object::player
3035 player 3421 player
3036 3422
3037 cf::player 3423 cf::player
3043=cut 3429=cut
3044 3430
3045for ( 3431for (
3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3432 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3047 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3048 decrease split destroy change_exp)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3049 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3050 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3051 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3052) { 3438) {
3053 no strict 'refs';
3054 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3055 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3056 for @funs; 3441 for @funs;
3057} 3442}
3058 3443
3073 3458
3074 my $qcode = $code; 3459 my $qcode = $code;
3075 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3076 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3077 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3078 local $_; 3466 local $_;
3079 local @safe::cf::_safe_eval_args = values %vars;
3080 3467
3081 my $eval = 3468 my $eval =
3082 "do {\n" 3469 "do {\n"
3083 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3084 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3085 . $code 3472 . $code
3086 . "\n}" 3473 . "\n}"
3087 ; 3474 ;
3088 3475
3476 if ($CFG{safe_eval}) {
3089 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3090 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3091 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3092 3485
3093 if ($@) { 3486 if ($@) {
3094 warn "$@"; 3487 warn "$@",
3095 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3096 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3097 } 3490 }
3098 3491
3099 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3100} 3493}
3101 3494
3115=cut 3508=cut
3116 3509
3117sub register_script_function { 3510sub register_script_function {
3118 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3119 3512
3120 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3121 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3122} 3515}
3123 3516
3124=back 3517=back
3125 3518
3126=cut 3519=cut
3127 3520
3128############################################################################# 3521#############################################################################
3129# the server's init and main functions 3522# the server's init and main functions
3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub set_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3130 3547
3131sub load_facedata($) { 3548sub load_facedata($) {
3132 my ($path) = @_; 3549 my ($path) = @_;
3133 3550
3134 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3135 # for this (global event?) 3552 # for this (global event?)
3136 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3137 3554
3138 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3139 3556
3140 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3141 3558
3142 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3143 0 < aio_load $path, $facedata
3144 or die "$path: $!";
3145
3146 $facedata = Coro::Storable::thaw $facedata;
3147 3560
3148 $facedata->{version} == 2 3561 $facedata->{version} == 2
3149 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3150 3563
3151 # patch in the exptable
3152 $facedata->{resource}{"res/exp_table"} = {
3153 type => FT_RSRC,
3154 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3155 };
3156 cf::cede_to_tick; 3564 cf::cede_to_tick;
3157 3565
3158 { 3566 {
3159 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3160 3568
3161 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3162 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163 3572
3164 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3165 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3167 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3168 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3579
3169 cf::cede_to_tick; 3580 cf::cede_to_tick;
3170 } 3581 }
3171 3582
3172 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3173 next unless $info->{smooth}; 3584 next unless $info->{smooth};
3177 3588
3178 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3179 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3181 } else { 3592 } else {
3182 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3183 } 3594 }
3184 3595
3185 cf::cede_to_tick; 3596 cf::cede_to_tick;
3186 } 3597 }
3187 } 3598 }
3188 3599
3189 { 3600 {
3190 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3191 3602
3192 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3193 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3194 cf::cede_to_tick; 3605 cf::cede_to_tick;
3195 } 3606 }
3196 3607
3197 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3198 } 3609 }
3199 3610
3200 { 3611 {
3201 # TODO: for gcfclient pleasure, we should give resources
3202 # that gcfclient doesn't grok a >10000 face index.
3203 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3204 3613
3205 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3207 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3208 my $data;
3209 3618
3210 if ($info->{type} & 1) {
3211 # prepend meta info
3212
3213 my $meta = $enc->encode ({
3214 name => $name,
3215 %{ $info->{meta} || {} },
3216 });
3217
3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type}; 3619 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3225 } else { 3623 } else {
3226 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3227 } 3625 }
3228 3626
3229 cf::cede_to_tick; 3627 cf::cede_to_tick;
3230 } 3628 }
3231 } 3629 }
3232 3630
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3234 3632
3235 1 3633 1
3236} 3634}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
3257 3635
3258register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3259 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3260 3638
3261 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3269 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3270 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3271 cf::arch::commit_load; 3649 cf::arch::commit_load;
3272 3650
3273 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 set_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3274} 3665}
3275 3666
3276sub reload_regions { 3667sub reload_regions {
3277 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3278 # for this (global event?) 3669 # for this (global event?)
3293} 3684}
3294 3685
3295sub reload_archetypes { 3686sub reload_archetypes {
3296 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3297 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 set_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 set_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3298} 3698}
3299 3699
3300sub reload_treasures { 3700sub reload_treasures {
3301 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3302 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3303} 3703}
3304 3704
3705sub reload_sound {
3706 trace "loading sound config from $DATADIR/sound\n";
3707
3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3709
3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3711 my $sound = $soundconf->{compat}[$_]
3712 or next;
3713
3714 my $face = cf::face::find "sound/$sound->[1]";
3715 cf::sound::set $sound->[0] => $face;
3716 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3717 }
3718
3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face;
3722 }
3723}
3724
3305sub reload_resources { 3725sub reload_resources {
3306 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3307 3727
3728 reload_materials;
3308 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3309 reload_archetypes; 3732 reload_archetypes;
3310 reload_regions; 3733 reload_regions;
3311 reload_treasures; 3734 reload_treasures;
3312 3735
3313 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3314} 3737}
3315 3738
3316sub reload_config { 3739sub reload_config {
3317 open my $fh, "<:utf8", "$CONFDIR/config" 3740 trace "reloading config file...\n";
3318 or return;
3319 3741
3320 local $/; 3742 my $config = load_file "$CONFDIR/config";
3321 *CFG = YAML::Load <$fh>; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3322 3745
3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3324 3747
3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 3750
3328 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3351 3774
3352 seek $fh, 0, 0; 3775 seek $fh, 0, 0;
3353 print $fh $$; 3776 print $fh $$;
3354} 3777}
3355 3778
3779sub main_loop {
3780 trace "EV::loop starting\n";
3781 if (1) {
3782 EV::loop;
3783 }
3784 trace "EV::loop returned\n";
3785 goto &main_loop unless $REALLY_UNLOOP;
3786}
3787
3356sub main { 3788sub main {
3357 cf::init_globals; # initialise logging 3789 cf::init_globals; # initialise logging
3358 3790
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363 3795
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370 3797
3371 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3372 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3374 (async { 3801 (async {
3375 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3376 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3377 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3378 }; 3805 };
3379 3806
3380 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3381 3808
3382 cf::sync_job { 3809 cf::sync_job {
3810 cf::incloader::init ();
3811
3812 db_init;
3813
3814 cf::init_anim;
3815 cf::init_attackmess;
3816 cf::init_dynamic;
3817
3818 cf::load_settings;
3819
3383 reload_resources; 3820 reload_resources;
3384 reload_config; 3821 reload_config;
3385 db_init;
3386 3822
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid; 3823 cf::init_uuid;
3390 cf::init_signals; 3824 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills; 3825 cf::init_skills;
3393 3826
3394 cf::init_beforeplay; 3827 cf::init_beforeplay;
3395 3828
3396 atomic; 3829 atomic;
3398 load_extensions; 3831 load_extensions;
3399 3832
3400 utime time, time, $RUNTIMEFILE; 3833 utime time, time, $RUNTIMEFILE;
3401 3834
3402 # no (long-running) fork's whatsoever before this point(!) 3835 # no (long-running) fork's whatsoever before this point(!)
3836 use POSIX ();
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3837 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404 3838
3405 (pop @POST_INIT)->(0) while @POST_INIT; 3839 cf::_post_init 0;
3406 }; 3840 };
3407 3841
3408 EV::loop; 3842 cf::object::thawer::errors_are_fatal 0;
3843 info "parse errors in files are no longer fatal from this point on.\n";
3844
3845 AE::postpone {
3846 undef &main; # free gobs of memory :)
3847 };
3848
3849 goto &main_loop;
3409} 3850}
3410 3851
3411############################################################################# 3852#############################################################################
3412# initialisation and cleanup 3853# initialisation and cleanup
3413 3854
3414# install some emergency cleanup handlers 3855# install some emergency cleanup handlers
3415BEGIN { 3856BEGIN {
3416 our %SIGWATCHER = (); 3857 our %SIGWATCHER = ();
3417 for my $signal (qw(INT HUP TERM)) { 3858 for my $signal (qw(INT HUP TERM)) {
3418 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3859 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3419 cf::cleanup "SIG$signal"; 3860 cf::cleanup "SIG$signal";
3420 }; 3861 };
3421 } 3862 }
3422} 3863}
3423 3864
3424sub write_runtime_sync { 3865sub write_runtime_sync {
3866 my $t0 = AE::time;
3867
3425 # first touch the runtime file to show we are still running: 3868 # first touch the runtime file to show we are still running:
3426 # the fsync below can take a very very long time. 3869 # the fsync below can take a very very long time.
3427 3870
3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3871 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3429 3872
3430 my $guard = cf::lock_acquire "write_runtime"; 3873 my $guard = cf::lock_acquire "write_runtime";
3431 3874
3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3875 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3433 or return; 3876 or return;
3434 3877
3435 my $value = $cf::RUNTIME + 90 + 10; 3878 my $value = $cf::RUNTIME + 90 + 10;
3436 # 10 is the runtime save interval, for a monotonic clock 3879 # 10 is the runtime save interval, for a monotonic clock
3437 # 60 allows for the watchdog to kill the server. 3880 # 60 allows for the watchdog to kill the server.
3450 or return; 3893 or return;
3451 3894
3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3453 and return; 3896 and return;
3454 3897
3455 warn "runtime file written.\n"; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3456 3899
3457 1 3900 1
3458} 3901}
3459 3902
3460our $uuid_lock; 3903our $uuid_lock;
3472 or return; 3915 or return;
3473 3916
3474 my $value = uuid_seq uuid_cur; 3917 my $value = uuid_seq uuid_cur;
3475 3918
3476 unless ($value) { 3919 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n"; 3920 info "cowardly refusing to write zero uuid value!\n";
3478 return; 3921 return;
3479 } 3922 }
3480 3923
3481 my $value = uuid_str $value + $uuid_skip; 3924 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0; 3925 $uuid_skip = 0;
3492 or return; 3935 or return;
3493 3936
3494 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3495 and return; 3938 and return;
3496 3939
3497 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3498 3941
3499 1 3942 1
3500 3943
3501} 3944}
3502 3945
3508} 3951}
3509 3952
3510sub emergency_save() { 3953sub emergency_save() {
3511 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3512 3955
3513 warn "emergency_perl_save: enter\n"; 3956 info "emergency_perl_save: enter\n";
3957
3958 # this is a trade-off: we want to be very quick here, so
3959 # save all maps without fsync, and later call a global sync
3960 # (which in turn might be very very slow)
3961 local $USE_FSYNC = 0;
3514 3962
3515 cf::sync_job { 3963 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so 3964 cf::write_runtime_sync; # external watchdog should not bark
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520 3965
3521 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3524 warn "emergency_perl_save: begin player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3972 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3974 $pl->save;
3530 } 3975 }
3531 warn "emergency_perl_save: end player save\n"; 3976 info "emergency_perl_save: end player save\n";
3532 3977
3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3533 warn "emergency_perl_save: begin map save\n"; 3980 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3983 $map->valid or next;
3537 $map->save; 3984 $map->save;
3538 } 3985 }
3539 warn "emergency_perl_save: end map save\n"; 3986 info "emergency_perl_save: end map save\n";
3540 3987
3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3541 warn "emergency_perl_save: begin database checkpoint\n"; 3990 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "emergency_perl_save: end database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3544 3993
3545 warn "emergency_perl_save: begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3995 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n"; 3996 info "emergency_perl_save: end write uuid\n";
3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 trace "emergency_perl_save: syncing database to disk";
4001 BDB::db_env_txn_checkpoint $DB_ENV;
4002
4003 info "emergency_perl_save: starting sync\n";
4004 IO::AIO::aio_sync sub {
4005 info "emergency_perl_save: finished sync\n";
4006 };
4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 trace "emergency_perl_save: flushing outstanding aio requests";
4011 while (IO::AIO::nreqs || BDB::nreqs) {
4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4013 }
4014
4015 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 4016 };
3549 4017
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3555 warn "emergency_perl_save: leave\n"; 4018 info "emergency_perl_save: leave\n";
3556} 4019}
3557 4020
3558sub post_cleanup { 4021sub post_cleanup {
3559 my ($make_core) = @_; 4022 my ($make_core) = @_;
3560 4023
4024 IO::AIO::flush;
4025
3561 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3562 if $make_core; 4027 if $make_core;
3563 4028
3564 my $fh = pidfile; 4029 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$; 4030 unlink $PIDFILE if <$fh> == $$;
3566} 4031}
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4051 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) { 4052 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"}; 4053 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4054# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 } 4055 }
3591 warn "cleared package $pkg\n";#d#
3592} 4056}
3593 4057
3594sub do_reload_perl() { 4058sub do_reload_perl() {
3595 # can/must only be called in main 4059 # can/must only be called in main
3596 if ($Coro::current != $Coro::main) { 4060 unless (in_main) {
3597 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3598 return; 4062 return;
3599 } 4063 }
3600 4064
3601 return if $RELOAD++; 4065 return if $RELOAD++;
3602 4066
3603 my $t1 = EV::time; 4067 my $t1 = AE::time;
3604 4068
3605 while ($RELOAD) { 4069 while ($RELOAD) {
3606 warn "reloading..."; 4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
3607 4072
3608 warn "entering sync_job"; 4073 trace "perl_reload: entering sync_job";
3609 4074
3610 cf::sync_job { 4075 cf::sync_job {
3611 cf::write_runtime_sync; # external watchdog should not bark
3612 cf::emergency_save; 4076 #cf::emergency_save;
3613 cf::write_runtime_sync; # external watchdog should not bark
3614 4077
3615 warn "syncing database to disk";
3616 BDB::db_env_txn_checkpoint $DB_ENV;
3617
3618 # if anything goes wrong in here, we should simply crash as we already saved
3619
3620 warn "flushing outstanding aio requests";
3621 while (IO::AIO::nreqs || BDB::nreqs) {
3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3623 }
3624
3625 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3626 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3627 %EXT_CORO = (); 4080 %EXT_CORO = ();
3628 4081
3629 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3630 %COMMAND = (); 4083 %COMMAND = ();
3631 4084
3632 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3633 %EXTCMD = (); 4086 %EXTCMD = ();
3634 %EXTICMD = (); 4087 %EXTICMD = ();
3635 4088
3636 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3637 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3638 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3639 4092
3640 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3641 eval { 4094 eval {
3642 $cb->($pkg); 4095 $cb->($pkg);
3643 1 4096 1
3644 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
3645 } 4098 }
3646 4099
3647 warn "... clearing $pkg"; 4100 trace "... clearing $pkg";
3648 clear_package $pkg; 4101 clear_package $pkg;
3649 } 4102 }
3650 4103
3651 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654 4107
3655 warn "... unloading $k"; 4108 trace "... unloading $k";
3656 delete $INC{$k}; 4109 delete $INC{$k};
3657 4110
3658 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3660 4113
3663 } 4116 }
3664 4117
3665 clear_package $k; 4118 clear_package $k;
3666 } 4119 }
3667 4120
3668 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3669 clear_package "safe::$_" 4122 clear_package "safe::$_"
3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4123 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3671 4124
3672 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3673 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3674 delete $INC{"cf/pod.pm"}; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3675 4128
3676 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3677 # and global variables created in xs 4130 # and global variables created in xs
3678 #clear_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3679 4132
3680 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3681 4134
3682 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3683 require cf; 4136 require cf;
3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4137 cf::_connect_to_perl_1;
3685 4138
3686 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3687 cf::reload_config; 4140 cf::reload_config;
3688 4141
3689 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3690 cf::load_extensions; 4143 cf::load_extensions;
3691 4144
3692 if ($REATTACH_ON_RELOAD) { 4145 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
3699 } 4152 }
3700 4153
3701 warn "running post_init jobs"; 4154 cf::_post_init 1;
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3703 4155
3704 warn "leaving sync_job"; 4156 trace "perl_reload: leaving sync_job";
3705 4157
3706 1 4158 1
3707 } or do { 4159 } or do {
3708 warn $@; 4160 error $@;
3709 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
3710 }; 4162 };
3711 4163
3712 warn "reloaded";
3713 --$RELOAD; 4164 --$RELOAD;
3714 } 4165 }
3715 4166
3716 $t1 = EV::time - $t1; 4167 $t1 = AE::time - $t1;
3717 warn "reload completed in ${t1}s\n"; 4168 info "perl_reload: completed in ${t1}s\n";
3718}; 4169};
3719 4170
3720our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3721 4172
3722sub reload_perl() { 4173sub reload_perl() {
3724 # coro crashes during coro_state_free->destroy here. 4175 # coro crashes during coro_state_free->destroy here.
3725 4176
3726 $RELOAD_WATCHER ||= cf::async { 4177 $RELOAD_WATCHER ||= cf::async {
3727 Coro::AIO::aio_wait cache_extensions; 4178 Coro::AIO::aio_wait cache_extensions;
3728 4179
3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4180 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3730 do_reload_perl; 4181 do_reload_perl;
3731 undef $RELOAD_WATCHER; 4182 undef $RELOAD_WATCHER;
3732 }; 4183 };
3733 }; 4184 };
3734} 4185}
3743 reload_perl; 4194 reload_perl;
3744 }; 4195 };
3745 } 4196 }
3746}; 4197};
3747 4198
3748unshift @INC, $LIBDIR; 4199#############################################################################
3749 4200
3750my $bug_warning = 0; 4201my $bug_warning = 0;
3751 4202
3752our @WAIT_FOR_TICK;
3753our @WAIT_FOR_TICK_BEGIN;
3754
3755sub wait_for_tick { 4203sub wait_for_tick() {
3756 return if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3757 4205
3758 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3759 push @WAIT_FOR_TICK, $signal;
3760 $signal->wait;
3761} 4207}
3762 4208
3763sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3764 return if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3765 4211
3766 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3767 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3768 $signal->wait; 4214 $signal->wait;
3769} 4215}
3773 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3774 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3775 return; 4221 return;
3776 } 4222 }
3777 4223
3778 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4225
4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3779 4227
3780 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3782 Coro::async_pool { 4230 Coro::async_pool {
3783 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3784 write_runtime_sync 4232 write_runtime_sync
3785 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3786 }; 4234 };
3787 } 4235 }
3788 4236
3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3790 $sig->send; 4238 $sig->send;
3791 } 4239 }
3792 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
3793 $sig->send;
3794 }
3795 4241
3796 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
3797 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3798 4244
3799 if (0) { 4245 if (0) {
3800 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
3801 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
3804 } 4250 }
3805 } 4251 }
3806} 4252}
3807 4253
3808{ 4254{
3809 # configure BDB 4255 # configure BDB
4256 info "initialising database";
3810 4257
3811 BDB::min_parallel 8; 4258 BDB::min_parallel 16;
3812 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
3813 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
3814 4261
3815 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
3816 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
3817 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3818 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3844 }; 4291 };
3845 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3846 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3847 }; 4294 };
4295
4296 info "database initialised";
3848} 4297}
3849 4298
3850{ 4299{
3851 # configure IO::AIO 4300 # configure IO::AIO
3852 4301
4302 info "initialising aio";
3853 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
3854 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
3855 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
3856} 4307}
3857 4308
3858my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
3859 4311
3860sub _log_backtrace { 4312sub _log_backtrace {
3861 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
3862 4314
3863 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
3864 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3865 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
3866 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
3867 ++$_log_backtrace; 4323 ++$_log_backtrace;
3868 my $perl_bt = Carp::longmess $msg; 4324 my $perl_bt = Carp::longmess $msg;
3869 async { 4325 async {
3870 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
3871 4327
3891 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
3892 --$_log_backtrace; 4348 --$_log_backtrace;
3893 }; 4349 };
3894 } else { 4350 } else {
3895 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
3896 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3897 } 4353 }
3898} 4354}
3899 4355
3900# load additional modules 4356# load additional modules
3901use cf::pod; 4357require "cf/$_.pm" for @EXTRA_MODULES;
4358cf::_connect_to_perl_2;
3902 4359
3903END { cf::emergency_save } 4360END { cf::emergency_save }
3904 4361
39051 43621
3906 4363

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines