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.473 by root, Fri Jun 26 16:32:10 2009 UTC vs.
Revision 1.611 by root, Tue Nov 20 14:54:17 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
72 74
73# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
78 85
79our %COMMAND = (); 86our %COMMAND = ();
80our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
81 88
82our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
84our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
87 96
88our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
90 101
91our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
92our $DATADIR = datadir; 104our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
96our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 117
105our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
106 125
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 128our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 134our $DB_ENV;
116 135
117our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 137
119our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
120 140
121our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
123our $NOW; 144our $NOW;
124 145
125our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 155our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
136 157
137our @POST_INIT; 158our @POST_INIT;
138 159
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
140 165
141binmode STDOUT; 166binmode STDOUT;
142binmode STDERR; 167binmode STDERR;
143 168
144# read virtual server time, if available 169# read virtual server time, if available
155 180
156our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
157 182
158sub cf::map::normalise; 183sub cf::map::normalise;
159 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
160############################################################################# 189#############################################################################
161 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
162=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
163 203
164=over 4 204=over 4
165 205
166=item $cf::UPTIME 206=item $cf::UPTIME
167 207
168The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
169 224
170=item $cf::RUNTIME 225=item $cf::RUNTIME
171 226
172The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 228every server tick.
174 229
175=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
176$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
177$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
178 233
179Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
182database environment. 237database environment.
183 238
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 239=item $cf::LOADAVG
193 240
194The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
204Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
205from wherever your confdir points to. 252from wherever your confdir points to.
206 253
207=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
208 255
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
210returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
212 277
213=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
214 279
215This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 282that call.
218 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
219=back 290=back
220 291
221=cut 292=cut
222 293
223BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
224 *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 {
225 my $msg = join "", @_; 301 my $msg = join "", @_;
226 302
227 $msg .= "\n" 303 $msg .= "\n"
228 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
229 305
230 $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;
231 307
232 LOG llevError, $msg; 308 LOG llevWarn, $msg;
233 }; 309};
234}
235 310
236$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
238 313
239 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 318 return;#d#
242 }#d# 319 }#d#
243 320
244 # kill coroutine otherwise 321 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 322 Coro::terminate
247}; 323};
248
249$SIG{__DIE__} = sub { }; #d#?
250 324
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 342)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 344}
271 345
272$EV::DIED = sub { 346$EV::DIED = sub {
273 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
274}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
275 354
276############################################################################# 355#############################################################################
277 356
278=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
279 358
300 $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;
301 $d 380 $d
302 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
303} 382}
304 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
305=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
306 437
307Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
308 439
309=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
315our $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
316 447
317sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
319 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
320=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
321 483
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
324 486
325The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 488is a reload or not.
327 489
328=cut 490=cut
329 491
330sub post_init(&) { 492sub post_init(&) {
331 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 }
332} 511}
333 512
334=item cf::lock_wait $string 513=item cf::lock_wait $string
335 514
336Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
375} 554}
376 555
377=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
378 557
379Like 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
380get spread over timer. 559get spread over time.
381 560
382=cut 561=cut
383 562
384sub periodic($$) { 563sub periodic($$) {
385 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
390} 569}
391 570
392=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
393 572
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
395This 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
396of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
397 580
398The 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
399used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
400 583
401Useful for short background jobs. 584Useful for short background jobs.
402 585
403=cut 586=cut
404 587
405our @SLOT_QUEUE; 588our @SLOT_QUEUE;
406our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
407 591
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
411 595
412 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
413 598
414 while () { 599 while () {
415 next_job: 600 next_job:
601
416 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 603
418 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 608 $job->[2]->send;
422 Coro::cede; 609 Coro::cede;
423 goto next_job; 610 goto next_job;
424 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 613 }
426 } 614 }
427 615
428 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 619 } else {
620 $busy = 0;
433 Coro::schedule; 621 Coro::schedule;
434 } 622 }
435 } 623 }
436}; 624};
437 625
438sub get_slot($;$$) { 626sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
440 628
441 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
442 630
443 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
444 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
445 634
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
474=cut 663=cut
475 664
476sub sync_job(&) { 665sub sync_job(&) {
477 my ($job) = @_; 666 my ($job) = @_;
478 667
479 if ($Coro::current == $Coro::main) { 668 if (in_main) {
480 my $time = EV::time; 669 my $time = AE::time;
481 670
482 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
484 673
485 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
486 675
487 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
488 677
489 my $busy = 1; 678 my $busy = 1;
490 my @res; 679 my @res;
491 680
492 (async { 681 (async {
493 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 683 @res = eval { $job->() };
495 warn $@ if $@; 684 error $@ if $@;
496 undef $busy; 685 undef $busy;
497 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
498 687
499 while ($busy) { 688 while ($busy) {
500 if (Coro::nready) { 689 if (Coro::nready) {
502 } else { 691 } else {
503 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
504 } 693 }
505 } 694 }
506 695
507 my $time = EV::time - $time; 696 my $time = AE::time - $time;
508 697
509 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
510 699
511 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
512 } else { 701 } else {
534 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
535 724
536 $coro 725 $coro
537} 726}
538 727
539=item fork_call { }, $args 728=item fork_call { }, @args
540 729
541Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 733never block itself or use any form of event handling.
545 734
546=cut 735=cut
547 736
737sub post_fork {
738 reset_signals;
739}
740
548sub fork_call(&@) { 741sub fork_call(&@) {
549 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
550 743
551 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious)
554
555 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
556 reset_signals; 745 cf::post_fork;
557 &$cb 746 &$cb
558 }, @args; 747 } @args;
559 748
560 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
561} 761}
562 762
563=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
564 764
565=cut 765=cut
602within each server. 802within each server.
603 803
604=cut 804=cut
605 805
606sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
607 my ($name) = @_; 810 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
609 812
610 eval { 813 eval {
611 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
621} 824}
622 825
623our $DB; 826our $DB;
624 827
625sub db_init { 828sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
628 };
629} 830}
630 831
631sub db_get($$) { 832sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
633 834
634 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
635 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
636 839
637 $! ? () 840 $! ? ()
638 : $data 841 : $data
639 }
640} 842}
641 843
642sub db_put($$$) { 844sub db_put($$$) {
643 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 874
673 my @data; 875 my @data;
674 my $md5; 876 my $md5;
675 877
676 for (0 .. $#$src) { 878 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 880 }
680 881
681 # if processing is expensive, check 882 # if processing is expensive, check
682 # checksum first 883 # checksum first
683 if (1) { 884 if (1) {
696 897
697 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
698 } 899 }
699 } 900 }
700 901
701 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
702 my $data = $process->(\@data); 903 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
704 905
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 907
707 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
710 911
720 921
721=cut 922=cut
722 923
723sub datalog($@) { 924sub datalog($@) {
724 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 927}
727 928
728=back 929=back
729 930
730=cut 931=cut
925 1126
926 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1129
929 } elsif (ref $type) { 1130 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
931 1132
932 } else { 1133 } else {
933 shift @arg; 1134 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
935 } 1136 }
936 } 1137 }
937} 1138}
938 1139
939sub _object_attach { 1140sub _object_attach {
949 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
950 } 1151 }
951 1152
952 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
953 } else { 1154 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1156 }
956 1157
957 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
958} 1159}
959 1160
1018 1219
1019 for (@$callbacks) { 1220 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1021 1222
1022 if ($@) { 1223 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1225 override;
1026 } 1226 }
1027 1227
1028 return 1 if $override; 1228 return 1 if $override;
1029 } 1229 }
1108 for (@$attach) { 1308 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1111 } 1311 }
1112 } else { 1312 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1314 }
1115 } 1315 }
1116} 1316}
1117 1317
1118cf::attachable->attach ( 1318cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1146 1346
1147 sync_job { 1347 sync_job {
1148 if (length $$rdata) { 1348 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1152 1353
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1179 1380
1180 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1383 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1184 } 1385 }
1185 } else { 1386 } else {
1186 aio_unlink $filename; 1387 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1188 } 1389 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1414 $av = $st->{objs};
1214 } 1415 }
1215 1416
1216 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1219 1421
1220 ($data, $av) 1422 ($data, $av)
1221} 1423}
1222 1424
1223=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1227=cut 1429=cut
1228 1430
1229############################################################################# 1431#############################################################################
1230# command handling &c 1432# command handling &c
1231 1433
1232=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1233 1435
1234Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1235$name. 1437$name.
1236 1438
1237=cut 1439=cut
1243 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1244 1446
1245 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1246} 1448}
1247 1449
1248=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1249 1451
1250Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1251extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1252received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1253the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1254has logged in successfully. 1456has logged in successfully.
1255 1457
1256If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1257called.
1258 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1259=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1260 1466
1261Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1262exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1263are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1264is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1265log-in. 1471log-in.
1266 1472
1267If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1268called.
1269 1474
1270=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1271 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1272sub register_extcmd { 1482sub register_extcmd($$) {
1273 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1274 1484
1275 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1276} 1486}
1277 1487
1278sub register_exticmd { 1488sub register_async_extcmd($$) {
1279 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1280 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1281 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1282} 1498}
1283 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1284use File::Glob (); 1506use File::Glob ();
1285 1507
1286cf::player->attach ( 1508cf::player->attach (
1287 on_command => sub { 1509 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1289 1511
1290 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1291 or return; 1513 or return;
1292 1514
1300 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1301 1523
1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1303 1525
1304 if (ref $msg) { 1526 if (ref $msg) {
1305 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1306 "ARRAY" eq ref $msg
1307 ? @$msg
1308 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1309 1528
1310 my @reply;
1311
1312 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1313 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1314 } 1547 }
1315 1548
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
1319 } else { 1549 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1551 }
1322 1552
1323 cf::override; 1553 cf::override;
1324 }, 1554 },
1325); 1555);
1335 }; 1565 };
1336 1566
1337 $grp 1567 $grp
1338} 1568}
1339 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1340sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1341 cf::sync_job { 1586 cf::sync_job {
1342 my %todo; 1587 my %todo;
1343 1588
1344 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1590 next unless -r $path;
1363 1608
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1611
1367 $ext{source} = 1612 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1370 . $source 1615 . $source
1371 . "\n};\n1"; 1616 . "\n};\n1";
1372 1617
1373 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1374 } 1619 }
1375 1620
1621 my $pass = 0;
1376 my %done; 1622 my %done;
1377 while (%todo) { 1623 while (%todo) {
1378 my $progress; 1624 my $progress;
1379 1625
1626 ++$pass;
1627
1628 ext:
1380 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1631 next ext
1383 unless exists $done{$_}; 1632 unless exists $done{$_};
1384 } 1633 }
1385 1634
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1636
1388 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1650
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1652 if exists $v->{meta}{mandatory};
1396 1653
1397 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1398 } 1663 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1664 }
1404 1665
1405 skip: 1666 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1408 } 1676 }
1409 }; 1677 };
1410} 1678}
1411 1679
1412############################################################################# 1680#############################################################################
1496 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1497 } 1765 }
1498 } 1766 }
1499} 1767}
1500 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1501sub save($) { 1782sub save($) {
1502 my ($pl) = @_; 1783 my ($pl) = @_;
1503 1784
1504 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1505 1786
1510 1791
1511 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1513 1794
1514 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1515 1799
1516 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1801 cf::cede_to_tick;
1518} 1802}
1519 1803
1553 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1554 1838
1555 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1557 1841
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1843 $pl->deactivate;
1844
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1563 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1564 1850
1565 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1621 \@logins 1907 \@logins
1622} 1908}
1623 1909
1624=item $player->maps 1910=item $player->maps
1625 1911
1912=item cf::player::maps $login
1913
1626Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1627player. May block. 1915player. May block.
1628 1916
1629=cut 1917=cut
1630 1918
1651 1939
1652=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1653 1941
1654Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1655 1943
1656=item $player->ext_reply ($msgid, @msg)
1657
1658Sends an ext reply to the player.
1659
1660=cut
1661
1662sub ext_reply($$@) {
1663 my ($self, $id, @msg) = @_;
1664
1665 $self->ns->ext_reply ($id, @msg)
1666}
1667
1668=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1669 1945
1670Sends an ext event to the client. 1946Sends an ext event to the client.
1671 1947
1672=cut 1948=cut
1691 1967
1692=cut 1968=cut
1693 1969
1694sub find_by_path($) { 1970sub find_by_path($) {
1695 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1696 1974
1697 my ($match, $specificity); 1975 my ($match, $specificity);
1698 1976
1699 for my $region (list) { 1977 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1729sub generate_random_map { 2007sub generate_random_map {
1730 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1731 2009
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733 2011
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 2013}
1749 2014
1750=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1751 2016
1752Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1757 2022
1758sub register { 2023sub register {
1759 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 2025 my $pkg = caller;
1761 2026
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 2028
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 2030}
1767 2031
1768# also paths starting with '/' 2032# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 2034
1771sub thawer_merge { 2035sub thawer_merge {
1772 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1773 2037
1774 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1779} 2043}
1780 2044
1781sub normalise { 2045sub normalise {
1782 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1783 2047
1784 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1785 2049
1786 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1787 2051
1788 # map plan: 2052 # map plan:
1789 # 2053 #
1804 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 2069 $path = "$base/$path";
1806 } 2070 }
1807 2071
1808 for ($path) { 2072 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1812 } 2075 }
1813 2076
1814 $path 2077 $path
1828 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1829 return $self; 2092 return $self;
1830 } 2093 }
1831 } 2094 }
1832 2095
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 2097 ()
1835} 2098}
1836 2099
2100# may re-bless or do other evil things
1837sub init { 2101sub init {
1838 my ($self) = @_; 2102 my ($self) = @_;
1839 2103
1840 $self 2104 $self
1841} 2105}
1906 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1907 2171
1908 1 2172 1
1909} 2173}
1910 2174
2175# used to laod the header of an original map
1911sub load_header_orig { 2176sub load_header_orig {
1912 my ($self) = @_; 2177 my ($self) = @_;
1913 2178
1914 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1915} 2180}
1916 2181
2182# used to laod the header of an instantiated map
1917sub load_header_temp { 2183sub load_header_temp {
1918 my ($self) = @_; 2184 my ($self) = @_;
1919 2185
1920 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1921} 2187}
1922 2188
2189# called after loading the header from an instantiated map
1923sub prepare_temp { 2190sub prepare_temp {
1924 my ($self) = @_; 2191 my ($self) = @_;
1925 2192
1926 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1927 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1928 # safety 2195 # safety
1929 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1930 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1931} 2198}
1932 2199
2200# called after loading the header from an original map
1933sub prepare_orig { 2201sub prepare_orig {
1934 my ($self) = @_; 2202 my ($self) = @_;
1935 2203
1936 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1937 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1961 2229
1962sub find; 2230sub find;
1963sub find { 2231sub find {
1964 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1965 2233
2234 cf::cede_to_tick;
2235
1966 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1967 2237
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2240
1971 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1988 2258
1989 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1990 } 2260 }
1991} 2261}
1992 2262
1993sub pre_load { } 2263sub pre_load { }
1994sub post_load { } 2264#sub post_load { } # XS
1995 2265
1996sub load { 2266sub load {
1997 my ($self) = @_; 2267 my ($self) = @_;
1998 2268
1999 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2002 2272
2003 { 2273 {
2004 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2005 2275
2006 return unless $self->valid; 2276 return unless $self->valid;
2007 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2008
2009 $self->in_memory (cf::MAP_LOADING);
2010 2278
2011 $self->alloc; 2279 $self->alloc;
2012 2280
2013 $self->pre_load; 2281 $self->pre_load;
2014 cf::cede_to_tick; 2282 cf::cede_to_tick;
2015 2283
2284 if (exists $self->{load_path}) {
2016 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block; 2286 $f->skip_block;
2018 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2019 or return; 2288 or return;
2020 2289
2021 $self->post_load_original 2290 $self->post_load_original
2022 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2023 2292
2024 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2025 utf8::encode $uniq; 2294 utf8::encode $uniq;
2026 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2028 $self->clear_unique_items; 2297 $self->clear_unique_items;
2029 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2031 } 2301 }
2032 } 2302 }
2033 }
2034 2303
2035 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2036 2311
2037 cf::cede_to_tick; 2312 cf::cede_to_tick;
2038 # now do the right thing for maps 2313 # now do the right thing for maps
2039 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2040 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2044 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2045 $self->decay_objects; 2320 $self->decay_objects;
2046 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2047 $self->update_buttons; 2322 $self->update_buttons;
2048 cf::cede_to_tick; 2323 cf::cede_to_tick;
2049 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2050 } 2325 }
2051 2326
2052 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2054
2055 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2329 }
2057 2330
2058 $self->post_load; 2331 $self->post_load;
2059}
2060 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2061sub customise_for { 2339sub customise_for {
2062 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2063 2341
2064 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2343 if $self->per_player;
2068# if $self->per_party; 2346# if $self->per_party;
2069 2347
2070 $self 2348 $self
2071} 2349}
2072 2350
2073# find and load all maps in the 3x3 area around a map
2074sub load_neighbours {
2075 my ($map) = @_;
2076
2077 my @neigh; # diagonal neighbours
2078
2079 for (0 .. 3) {
2080 my $neigh = $map->tile_path ($_)
2081 or next;
2082 $neigh = find $neigh, $map
2083 or next;
2084 $neigh->load;
2085
2086 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 }
2090
2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
2093 my $neigh = find $path, $origin
2094 or next;
2095 $neigh->load;
2096 }
2097}
2098
2099sub find_sync { 2351sub find_sync {
2100 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2101 2353
2102 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2103} 2359}
2104 2360
2105sub do_load_sync { 2361sub do_load_sync {
2106 my ($map) = @_; 2362 my ($map) = @_;
2107 2363
2364 # it's a bug to call this from the main context
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2110 2367
2111 cf::sync_job { $map->load }; 2368 $map->load;
2112} 2369}
2113 2370
2114our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2116 2373
2117sub find_async { 2374sub find_async {
2118 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2119 2376
2120 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2121 2378
2122 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2124 } 2381 }
2125 2382
2126 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2127 2384
2128 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2142 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2143 2400
2144 () 2401 ()
2145} 2402}
2146 2403
2404# common code, used by both ->save and ->swapout
2147sub save { 2405sub _save {
2148 my ($self) = @_; 2406 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2407
2152 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2153 2409
2154 return unless $self->dirty; 2410 return unless $self->dirty;
2155 2411
2175 } else { 2431 } else {
2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 } 2433 }
2178} 2434}
2179 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2180sub swap_out { 2444sub swap_out {
2181 my ($self) = @_; 2445 my ($self) = @_;
2182 2446
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2188 return if $self->players; 2451 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2190 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2191 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2192 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2193 2503
2194 $self->deactivate; 2504 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2506 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2507
2242 $self->unlink_save; 2508 $self->unlink_save;
2243 $self->destroy; 2509 $self->destroy;
2244} 2510}
2245 2511
2253 2519
2254 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2255 2521
2256 $self->unlink_save; 2522 $self->unlink_save;
2257 2523
2258 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2529
2320 : normalise $_ 2586 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2588 ]
2323} 2589}
2324 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2325=back 2623=back
2326 2624
2327=head3 cf::object 2625=head3 cf::object
2328 2626
2329=cut 2627=cut
2352 2650
2353Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2354 2652
2355=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2356 2654
2357returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2358even if the object actually exists. May block. 2656even if the object actually exists. May block.
2359 2657
2360=cut 2658=cut
2361 2659
2362sub deref { 2660sub deref {
2461 2759
2462Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2463 2761
2464The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2465for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2467map. 2765map.
2468 2766
2469Will never block. 2767Will never block.
2470 2768
2471=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2493 my ($self) = @_; 2791 my ($self) = @_;
2494 2792
2495 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2496 2794
2795 ++$self->{_link_recursion};
2796
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2798
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2501 2801
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2803}
2504 2804
2505sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2507 2807
2524 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2526 2826
2527 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2530 2830
2531 $map->load; 2831 $map->load;
2532 $map->load_neighbours;
2533 2832
2534 return unless $self->contr->active; 2833 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2834
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2540} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2541 2842
2843}
2844
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2543 2846
2544Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2545her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2546that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2547the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2554 2857
2555our $GOTOGEN; 2858our $GOTOGEN;
2556 2859
2557sub cf::object::player::goto { 2860sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2559 2868
2560 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2871
2563 $self->enter_link; 2872 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2584 } 2893 }
2585 } 2894 }
2586 2895
2587 my $map = eval { 2896 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2898
2590 if ($map) { 2899 if ($map) {
2591 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2902 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2904 }
2596 2905
2597 $map 2906 $map
2605 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2608 } 2917 }
2609 2918
2610 $done->() if $done; 2919 $done->($self) if $done;
2611 })->prio (1); 2920 })->prio (1);
2612} 2921}
2613 2922
2614=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2615 2924
2683 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2684 2993
2685 unless (eval { 2994 unless (eval {
2686 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2687 2996
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2697 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2699 3023
2700 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2701 3025
2702 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2708 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2710 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2712 3036
2713 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 3038 $self->leave_link;
2715 } 3039 }
2716 })->prio (1); 3040 })->prio (1);
2717} 3041}
2718 3042
2719=head3 cf::client 3043=head3 cf::client
2720 3044
2721=over 4 3045=over 4
2722 3046
2723=item $client->send_drawinfo ($text, $flags) 3047=item $client->send_big_packet ($pkt)
2724 3048
2725Sends a drawinfo packet to the client. Circumvents output buffering so 3049Like C<send_packet>, but tries to compress large packets, and fragments
2726should not be used under normal circumstances. 3050them as required.
2727 3051
2728=cut 3052=cut
2729 3053
3054our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3055
2730sub cf::client::send_drawinfo { 3056sub cf::client::send_big_packet {
2731 my ($self, $text, $flags) = @_; 3057 my ($self, $pkt) = @_;
2732 3058
2733 utf8::encode $text; 3059 # try lzf for large packets
2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3060 $pkt = "lzf " . Compress::LZF::compress $pkt
3061 if 1024 <= length $pkt and $self->{can_lzf};
3062
3063 # split very large packets
3064 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3065 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3066 $pkt = "frag";
3067 }
3068
3069 $self->send_packet ($pkt);
2735} 3070}
2736 3071
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 3073
2739Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2740client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2741the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2742the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2743 3078
2744=cut 3079=cut
2745 3080
2746# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 3082our %CHANNEL = (
3083 "c/motd" => {
3084 id => "infobox",
3085 title => "MOTD",
3086 reply => undef,
3087 tooltip => "The message of the day",
3088 },
2748 "c/identify" => { 3089 "c/identify" => {
2749 id => "infobox", 3090 id => "infobox",
2750 title => "Identify", 3091 title => "Identify",
2751 reply => undef, 3092 reply => undef,
2752 tooltip => "Items recently identified", 3093 tooltip => "Items recently identified",
2754 "c/examine" => { 3095 "c/examine" => {
2755 id => "infobox", 3096 id => "infobox",
2756 title => "Examine", 3097 title => "Examine",
2757 reply => undef, 3098 reply => undef,
2758 tooltip => "Signs and other items you examined", 3099 tooltip => "Signs and other items you examined",
3100 },
3101 "c/shopinfo" => {
3102 id => "infobox",
3103 title => "Shop Info",
3104 reply => undef,
3105 tooltip => "What your bargaining skill tells you about the shop",
2759 }, 3106 },
2760 "c/book" => { 3107 "c/book" => {
2761 id => "infobox", 3108 id => "infobox",
2762 title => "Book", 3109 title => "Book",
2763 reply => undef, 3110 reply => undef,
2839 id => "death", 3186 id => "death",
2840 title => "Death", 3187 title => "Death",
2841 reply => undef, 3188 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
2843 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
2844 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
2846); 3199);
2847 3200
2848sub cf::client::send_msg { 3201sub cf::client::send_msg {
2879 my $pkt = "msg " 3232 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3233 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3234 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3235 );
2883 3236
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3237 $self->send_big_packet ($pkt);
2895} 3238}
2896 3239
2897=item $client->ext_msg ($type, @msg) 3240=item $client->ext_msg ($type, @msg)
2898 3241
2899Sends an ext event to the client. 3242Sends an ext event to the client.
2901=cut 3244=cut
2902 3245
2903sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
2905 3248
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3250}
2931 3251
2932=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
2933 3253
2934Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
2954 3274
2955 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
2956 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
2957 3277
2958 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
2959} 3317}
2960 3318
2961cf::client->attach ( 3319cf::client->attach (
2962 on_connect => sub { 3320 on_connect => sub {
2963 my ($ns) = @_; 3321 my ($ns) = @_;
2989 my ($ns, $buf) = @_; 3347 my ($ns, $buf) = @_;
2990 3348
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3349 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3350
2993 if (ref $msg) { 3351 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3352 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3353
2999 my @reply;
3000
3001 if (my $cb = $EXTICMD{$type}) { 3354 if (my $cb = $EXTIACMD{$type}) {
3355 $cb->(
3356 $ns,
3357 sub {
3358 $ns->ext_msg ("reply-$reply", @_)
3359 if $reply;
3360 },
3361 @payload
3362 );
3363 } else {
3364 my @reply;
3365
3366 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload); 3367 @reply = $cb->($ns, @payload);
3368 }
3369
3370 $ns->ext_msg ("reply-$reply", @reply)
3371 if $reply;
3003 } 3372 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else { 3373 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3374 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3375 }
3011 3376
3012 cf::override; 3377 cf::override;
3013 }, 3378 },
3014); 3379);
3034 3399
3035 $coro 3400 $coro
3036} 3401}
3037 3402
3038cf::client->attach ( 3403cf::client->attach (
3039 on_destroy => sub { 3404 on_client_destroy => sub {
3040 my ($ns) = @_; 3405 my ($ns) = @_;
3041 3406
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3407 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3408 },
3044); 3409);
3060our $safe_hole = new Safe::Hole; 3425our $safe_hole = new Safe::Hole;
3061 3426
3062$SIG{FPE} = 'IGNORE'; 3427$SIG{FPE} = 'IGNORE';
3063 3428
3064$safe->permit_only (Opcode::opset qw( 3429$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3430 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3431 grepstart grepwhile mapstart mapwhile
3067 sort time 3432 sort time
3068)); 3433));
3069 3434
3070# here we export the classes and methods available to script code 3435# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3460 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3461 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3462 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3463 ["cf::map" => qw(trigger)],
3099) { 3464) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3465 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3466 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3467 for @funs;
3104} 3468}
3105 3469
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3486 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3487 $qcode =~ s/\n/\\n/g;
3124 3488
3125 %vars = (_dummy => 0) unless %vars; 3489 %vars = (_dummy => 0) unless %vars;
3126 3490
3491 my @res;
3127 local $_; 3492 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3493
3130 my $eval = 3494 my $eval =
3131 "do {\n" 3495 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3496 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3497 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3498 . $code
3135 . "\n}" 3499 . "\n}"
3136 ; 3500 ;
3137 3501
3502 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3503 sub_generation_inc;
3504 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3505 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3506 sub_generation_inc;
3507 } else {
3508 local @cf::_safe_eval_args = values %vars;
3509 @res = wantarray ? eval eval : scalar eval $eval;
3510 }
3141 3511
3142 if ($@) { 3512 if ($@) {
3143 warn "$@"; 3513 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3514 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3515 "with arguments " . (join " ", %vars) . "\n";
3146 } 3516 }
3147 3517
3148 wantarray ? @res : $res[0] 3518 wantarray ? @res : $res[0]
3149} 3519}
3150 3520
3164=cut 3534=cut
3165 3535
3166sub register_script_function { 3536sub register_script_function {
3167 my ($fun, $cb) = @_; 3537 my ($fun, $cb) = @_;
3168 3538
3169 no strict 'refs'; 3539 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3540 *$fun = $safe_hole->wrap ($cb);
3171} 3541}
3172 3542
3173=back 3543=back
3174 3544
3175=cut 3545=cut
3176 3546
3177############################################################################# 3547#############################################################################
3178# the server's init and main functions 3548# the server's init and main functions
3179 3549
3550{
3551 package cf::face;
3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3560 # internal api, not finalised
3561 sub set {
3562 my ($name, $type, $data) = @_;
3563
3564 my $idx = cf::face::find $name;
3565
3566 if ($idx) {
3567 delete $HASH{cf::face::get_csum $idx};
3568 } else {
3569 $idx = cf::face::alloc $name;
3570 }
3571
3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3573
3574 cf::face::set_type $idx, $type;
3575 cf::face::set_csum $idx, 0, $hash;
3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3584 $HASH{$hash} = $idx;#d#
3585
3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3625}
3626
3180sub load_facedata($) { 3627sub load_facedata($) {
3181 my ($path) = @_; 3628 my ($path) = @_;
3182 3629
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3631
3189 warn "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3190 3633
3191 my $facedata; 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3635
3197 $facedata->{version} == 2 3636 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3199 3638
3200 # patch in the exptable 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3201 $facedata->{resource}{"res/exp_table"} = { 3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3202 type => FT_RSRC, 3641
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3204 }; 3643
3205 cf::cede_to_tick; 3644 # BEGIN ATOMIC
3645 # from here on, everything must be atomic - no thread switch allowed
3646 my $t1 = EV::time;
3206 3647
3207 { 3648 {
3208 my $faces = $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3209 3650
3210 while (my ($face, $info) = each %$faces) { 3651 for my $face (sort keys %$faces) {
3652 my $info = $faces->{$face};
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3654
3213 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3217 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3218 cf::cede_to_tick; 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3661 delete $cf::face::META[$idx];
3219 } 3662 }
3220 3663
3221 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3222 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3223 3666
3226 3669
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3670 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3673 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3675 }
3233
3234 cf::cede_to_tick;
3235 } 3676 }
3236 } 3677 }
3237 3678
3238 { 3679 {
3239 my $anims = $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3240 3681
3241 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3242 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3243 cf::cede_to_tick;
3244 } 3684 }
3245 3685
3246 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3247 } 3687 }
3248 3688
3249 { 3689 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3690 my $res = $facedata->{resource};
3253 3691
3254 while (my ($name, $info) = each %$res) { 3692 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3693 if (defined (my $type = $info->{type})) {
3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3696
3259 if ($info->{type} & 1) {
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3697 cf::face::set_type $idx, $type;
3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3702 $cf::face::HASH{$info->{hash}} = $idx;
3274 } else { 3703 } else {
3275 $RESOURCE{$name} = $info; 3704# $RESOURCE{$name} = $info; # unused
3276 } 3705 }
3277
3278 cf::cede_to_tick;
3279 } 3706 }
3280 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3281 3718
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3720
3721 aio_close $fh if $fh; # close old facedata
3722
3284 1 3723 1
3285} 3724}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3725
3307register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3727 my ($ns, $want) = @_;
3309 3728
3310 while (my ($k, $v) = each %$want) { 3729 while (my ($k, $v) = each %$want) {
3318 my $status = load_resource_file_ $_[0]; 3737 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3738 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3739 cf::arch::commit_load;
3321 3740
3322 $status 3741 $status
3742}
3743
3744sub reload_exp_table {
3745 _reload_exp_table;
3746
3747 cf::face::set
3748 "res/exp_table" => FT_RSRC,
3749 JSON::XS->new->utf8->canonical->encode (
3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3751 );
3752}
3753
3754sub reload_materials {
3755 _reload_materials;
3323} 3756}
3324 3757
3325sub reload_regions { 3758sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework 3759 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?) 3760 # for this (global event?)
3335 if exists $_->{match}; 3768 if exists $_->{match};
3336 } 3769 }
3337} 3770}
3338 3771
3339sub reload_facedata { 3772sub reload_facedata {
3340 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3341 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3342} 3775}
3343 3776
3344sub reload_archetypes { 3777sub reload_archetypes {
3345 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3346 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3780
3781 cf::face::set
3782 "res/skill_info" => FT_RSRC,
3783 JSON::XS->new->utf8->canonical->encode (
3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3785 );
3786
3787 cf::face::set
3788 "res/spell_paths" => FT_RSRC,
3789 JSON::XS->new->utf8->canonical->encode (
3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3347} 3806}
3348 3807
3349sub reload_treasures { 3808sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";
3352} 3811}
3353 3812
3813sub reload_sound {
3814 trace "loading sound config from $DATADIR/sound\n";
3815
3816 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3817
3818 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3819 my $sound = $soundconf->{compat}[$_]
3820 or next;
3821
3822 my $face = cf::face::find "sound/$sound->[1]";
3823 cf::sound::set $sound->[0] => $face;
3824 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3825 }
3826
3827 while (my ($k, $v) = each %{$soundconf->{event}}) {
3828 my $face = cf::face::find "sound/$v";
3829 cf::sound::set $k => $face;
3830 }
3831}
3832
3354sub reload_resources { 3833sub reload_resources {
3355 warn "reloading resource files...\n"; 3834 trace "reloading resource files...\n";
3356 3835
3836 reload_materials;
3357 reload_facedata; 3837 reload_facedata;
3838 reload_exp_table;
3839 reload_sound;
3358 reload_archetypes; 3840 reload_archetypes;
3359 reload_regions; 3841 reload_regions;
3360 reload_treasures; 3842 reload_treasures;
3361 3843
3362 warn "finished reloading resource files\n"; 3844 trace "finished reloading resource files\n";
3363} 3845}
3364 3846
3365sub reload_config { 3847sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3848 trace "reloading config file...\n";
3367 or return;
3368 3849
3369 local $/; 3850 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3851 utf8::decode $config;
3852 *CFG = decode_yaml $config;
3371 3853
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3854 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3855
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3856 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3857 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3858
3377 if (exists $CFG{mlockall}) { 3859 if (exists $CFG{mlockall}) {
3400 3882
3401 seek $fh, 0, 0; 3883 seek $fh, 0, 0;
3402 print $fh $$; 3884 print $fh $$;
3403} 3885}
3404 3886
3887sub main_loop {
3888 trace "EV::loop starting\n";
3889 if (1) {
3890 EV::loop;
3891 }
3892 trace "EV::loop returned\n";
3893 goto &main_loop unless $REALLY_UNLOOP;
3894}
3895
3405sub main { 3896sub main {
3406 cf::init_globals; # initialise logging 3897 cf::init_globals; # initialise logging
3407 3898
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3899 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3900 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3901 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3902 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412 3903
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3904 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 3905
3420 # we must not ever block the main coroutine 3906 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3907 $Coro::idle = sub {
3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3908 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3423 (async { 3909 (async {
3424 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3910 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT; 3911 EV::loop EV::LOOP_ONESHOT;
3426 })->prio (Coro::PRIO_MAX); 3912 })->prio (Coro::PRIO_MAX);
3427 }; 3913 };
3428 3914
3429 evthread_start IO::AIO::poll_fileno; 3915 evthread_start IO::AIO::poll_fileno;
3430 3916
3431 cf::sync_job { 3917 cf::sync_job {
3918 cf::incloader::init ();
3919
3920 db_init;
3921
3922 cf::init_anim;
3923 cf::init_attackmess;
3924 cf::init_dynamic;
3925
3926 cf::load_settings;
3927
3432 reload_resources; 3928 reload_resources;
3433 reload_config; 3929 reload_config;
3434 db_init;
3435 3930
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3931 cf::init_uuid;
3439 cf::init_signals; 3932 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3933 cf::init_skills;
3442 3934
3443 cf::init_beforeplay; 3935 cf::init_beforeplay;
3444 3936
3445 atomic; 3937 atomic;
3447 load_extensions; 3939 load_extensions;
3448 3940
3449 utime time, time, $RUNTIMEFILE; 3941 utime time, time, $RUNTIMEFILE;
3450 3942
3451 # no (long-running) fork's whatsoever before this point(!) 3943 # no (long-running) fork's whatsoever before this point(!)
3944 use POSIX ();
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3945 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453 3946
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3947 cf::_post_init 0;
3455 }; 3948 };
3456 3949
3457 EV::loop; 3950 cf::object::thawer::errors_are_fatal 0;
3951 info "parse errors in files are no longer fatal from this point on.\n";
3952
3953 AE::postpone {
3954 undef &main; # free gobs of memory :)
3955 };
3956
3957 goto &main_loop;
3458} 3958}
3459 3959
3460############################################################################# 3960#############################################################################
3461# initialisation and cleanup 3961# initialisation and cleanup
3462 3962
3463# install some emergency cleanup handlers 3963# install some emergency cleanup handlers
3464BEGIN { 3964BEGIN {
3465 our %SIGWATCHER = (); 3965 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3966 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3967 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3968 cf::cleanup "SIG$signal";
3469 }; 3969 };
3470 } 3970 }
3471} 3971}
3472 3972
3473sub write_runtime_sync { 3973sub write_runtime_sync {
3974 my $t0 = AE::time;
3975
3474 # first touch the runtime file to show we are still running: 3976 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3977 # the fsync below can take a very very long time.
3476 3978
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3979 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3980
3479 my $guard = cf::lock_acquire "write_runtime"; 3981 my $guard = cf::lock_acquire "write_runtime";
3480 3982
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3983 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3984 or return;
3483 3985
3484 my $value = $cf::RUNTIME + 90 + 10; 3986 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3987 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3988 # 60 allows for the watchdog to kill the server.
3499 or return; 4001 or return;
3500 4002
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4003 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 4004 and return;
3503 4005
3504 warn "runtime file written.\n"; 4006 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 4007
3506 1 4008 1
3507} 4009}
3508 4010
3509our $uuid_lock; 4011our $uuid_lock;
3521 or return; 4023 or return;
3522 4024
3523 my $value = uuid_seq uuid_cur; 4025 my $value = uuid_seq uuid_cur;
3524 4026
3525 unless ($value) { 4027 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 4028 info "cowardly refusing to write zero uuid value!\n";
3527 return; 4029 return;
3528 } 4030 }
3529 4031
3530 my $value = uuid_str $value + $uuid_skip; 4032 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 4033 $uuid_skip = 0;
3541 or return; 4043 or return;
3542 4044
3543 aio_rename "$uuid~", $uuid 4045 aio_rename "$uuid~", $uuid
3544 and return; 4046 and return;
3545 4047
3546 warn "uuid file written ($value).\n"; 4048 trace "uuid file written ($value).\n";
3547 4049
3548 1 4050 1
3549 4051
3550} 4052}
3551 4053
3557} 4059}
3558 4060
3559sub emergency_save() { 4061sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 4062 my $freeze_guard = cf::freeze_mainloop;
3561 4063
3562 warn "emergency_perl_save: enter\n"; 4064 info "emergency_perl_save: enter\n";
4065
4066 # this is a trade-off: we want to be very quick here, so
4067 # save all maps without fsync, and later call a global sync
4068 # (which in turn might be very very slow)
4069 local $USE_FSYNC = 0;
3563 4070
3564 cf::sync_job { 4071 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 4072 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 4073
3570 # use a peculiar iteration method to avoid tripping on perl 4074 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 4075 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 4076 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 4077 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 4078 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 4079 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 4080 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4081 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 4082 $pl->save;
3579 } 4083 }
3580 warn "emergency_perl_save: end player save\n"; 4084 info "emergency_perl_save: end player save\n";
3581 4085
4086 cf::write_runtime_sync; # external watchdog should not bark
4087
3582 warn "emergency_perl_save: begin map save\n"; 4088 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 4089 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 4090 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 4091 $map->valid or next;
3586 $map->save; 4092 $map->save;
3587 } 4093 }
3588 warn "emergency_perl_save: end map save\n"; 4094 info "emergency_perl_save: end map save\n";
3589 4095
4096 cf::write_runtime_sync; # external watchdog should not bark
4097
3590 warn "emergency_perl_save: begin database checkpoint\n"; 4098 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 4099 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 4100 info "emergency_perl_save: end database checkpoint\n";
3593 4101
3594 warn "emergency_perl_save: begin write uuid\n"; 4102 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 4103 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n"; 4104 info "emergency_perl_save: end write uuid\n";
4105
4106 cf::write_runtime_sync; # external watchdog should not bark
4107
4108 trace "emergency_perl_save: syncing database to disk";
4109 BDB::db_env_txn_checkpoint $DB_ENV;
4110
4111 info "emergency_perl_save: starting sync\n";
4112 IO::AIO::aio_sync sub {
4113 info "emergency_perl_save: finished sync\n";
4114 };
4115
4116 cf::write_runtime_sync; # external watchdog should not bark
4117
4118 trace "emergency_perl_save: flushing outstanding aio requests";
4119 while (IO::AIO::nreqs || BDB::nreqs) {
4120 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4121 }
4122
4123 cf::write_runtime_sync; # external watchdog should not bark
3597 }; 4124 };
3598 4125
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 4126 info "emergency_perl_save: leave\n";
3605} 4127}
3606 4128
3607sub post_cleanup { 4129sub post_cleanup {
3608 my ($make_core) = @_; 4130 my ($make_core) = @_;
3609 4131
4132 IO::AIO::flush;
4133
3610 warn Carp::longmess "post_cleanup backtrace" 4134 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 4135 if $make_core;
3612 4136
3613 my $fh = pidfile; 4137 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 4138 unlink $PIDFILE if <$fh> == $$;
3615} 4139}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4159 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 4160 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 4161 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4162# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 4163 }
3640 warn "cleared package $pkg\n";#d#
3641} 4164}
3642 4165
3643sub do_reload_perl() { 4166sub do_reload_perl() {
3644 # can/must only be called in main 4167 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 4168 unless (in_main) {
3646 warn "can only reload from main coroutine"; 4169 error "can only reload from main coroutine";
3647 return; 4170 return;
3648 } 4171 }
3649 4172
3650 return if $RELOAD++; 4173 return if $RELOAD++;
3651 4174
3652 my $t1 = EV::time; 4175 my $t1 = AE::time;
3653 4176
3654 while ($RELOAD) { 4177 while ($RELOAD) {
3655 warn "reloading..."; 4178 cf::get_slot 0.1, -1, "reload_perl";
4179 info "perl_reload: reloading...";
3656 4180
3657 warn "entering sync_job"; 4181 trace "perl_reload: entering sync_job";
3658 4182
3659 cf::sync_job { 4183 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 4184 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 4185
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 4186 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 4187 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 4188 %EXT_CORO = ();
3677 4189
3678 warn "removing commands"; 4190 trace "perl_reload: removing commands";
3679 %COMMAND = (); 4191 %COMMAND = ();
3680 4192
3681 warn "removing ext/exti commands"; 4193 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 4194 %EXTCMD = ();
3683 %EXTICMD = (); 4195 %EXTICMD = ();
3684 4196
3685 warn "unloading/nuking all extensions"; 4197 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 4198 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 4199 trace "... unloading $pkg";
3688 4200
3689 if (my $cb = $pkg->can ("unload")) { 4201 if (my $cb = $pkg->can ("unload")) {
3690 eval { 4202 eval {
3691 $cb->($pkg); 4203 $cb->($pkg);
3692 1 4204 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 4205 } or error "$pkg unloaded, but with errors: $@";
3694 } 4206 }
3695 4207
3696 warn "... clearing $pkg"; 4208 trace "... clearing $pkg";
3697 clear_package $pkg; 4209 clear_package $pkg;
3698 } 4210 }
3699 4211
3700 warn "unloading all perl modules loaded from $LIBDIR"; 4212 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 4213 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4214 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 4215
3704 warn "... unloading $k"; 4216 trace "... unloading $k";
3705 delete $INC{$k}; 4217 delete $INC{$k};
3706 4218
3707 $k =~ s/\.pm$//; 4219 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 4220 $k =~ s/\//::/g;
3709 4221
3712 } 4224 }
3713 4225
3714 clear_package $k; 4226 clear_package $k;
3715 } 4227 }
3716 4228
3717 warn "getting rid of safe::, as good as possible"; 4229 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 4230 clear_package "safe::$_"
3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4231 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3720 4232
3721 warn "unloading cf.pm \"a bit\""; 4233 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 4234 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4235 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 4236
3725 # don't, removes xs symbols, too, 4237 # don't, removes xs symbols, too,
3726 # and global variables created in xs 4238 # and global variables created in xs
3727 #clear_package __PACKAGE__; 4239 #clear_package __PACKAGE__;
3728 4240
3729 warn "unload completed, starting to reload now"; 4241 info "perl_reload: unload completed, starting to reload now";
3730 4242
3731 warn "reloading cf.pm"; 4243 trace "perl_reload: reloading cf.pm";
3732 require cf; 4244 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4245 cf::_connect_to_perl_1;
3734 4246
3735 warn "loading config and database again"; 4247 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 4248 cf::reload_config;
3737 4249
3738 warn "loading extensions"; 4250 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 4251 cf::load_extensions;
3740 4252
3741 if ($REATTACH_ON_RELOAD) { 4253 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 4254 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 4255 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 4256 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 4257 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 4258 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 4259 reattach $_ for values %PLAYER;
3748 } 4260 }
3749 4261
3750 warn "running post_init jobs"; 4262 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 4263
3753 warn "leaving sync_job"; 4264 trace "perl_reload: leaving sync_job";
3754 4265
3755 1 4266 1
3756 } or do { 4267 } or do {
3757 warn $@; 4268 error $@;
3758 cf::cleanup "error while reloading, exiting."; 4269 cf::cleanup "perl_reload: error, exiting.";
3759 }; 4270 };
3760 4271
3761 warn "reloaded";
3762 --$RELOAD; 4272 --$RELOAD;
3763 } 4273 }
3764 4274
3765 $t1 = EV::time - $t1; 4275 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4276 info "perl_reload: completed in ${t1}s\n";
3767}; 4277};
3768 4278
3769our $RELOAD_WATCHER; # used only during reload 4279our $RELOAD_WATCHER; # used only during reload
3770 4280
3771sub reload_perl() { 4281sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4283 # coro crashes during coro_state_free->destroy here.
3774 4284
3775 $RELOAD_WATCHER ||= cf::async { 4285 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4286 Coro::AIO::aio_wait cache_extensions;
3777 4287
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4288 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4289 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4290 undef $RELOAD_WATCHER;
3781 }; 4291 };
3782 }; 4292 };
3783} 4293}
3792 reload_perl; 4302 reload_perl;
3793 }; 4303 };
3794 } 4304 }
3795}; 4305};
3796 4306
3797unshift @INC, $LIBDIR; 4307#############################################################################
3798 4308
3799my $bug_warning = 0; 4309my $bug_warning = 0;
3800 4310
3801our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN;
3803
3804sub wait_for_tick { 4311sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4312 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3806 4313
3807 my $signal = new Coro::Signal; 4314 $WAIT_FOR_TICK->wait;
3808 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait;
3810} 4315}
3811 4316
3812sub wait_for_tick_begin { 4317sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4318 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3814 4319
3815 my $signal = new Coro::Signal; 4320 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4321 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4322 $signal->wait;
3818} 4323}
3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3823 unless ++$bug_warning > 10; 4328 unless ++$bug_warning > 10;
3824 return; 4329 return;
3825 } 4330 }
3826 4331
3827 cf::server_tick; # one server iteration 4332 cf::one_tick; # one server iteration
4333
4334 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3828 4335
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4336 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4337 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3831 Coro::async_pool { 4338 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4339 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4340 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4341 or error "ERROR: unable to write runtime file: $!";
3835 }; 4342 };
3836 } 4343 }
3837 4344
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4345 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4346 $sig->send;
3840 } 4347 }
3841 while (my $sig = shift @WAIT_FOR_TICK) { 4348 $WAIT_FOR_TICK->broadcast;
3842 $sig->send;
3843 }
3844 4349
3845 $LOAD = ($NOW - $TICK_START) / $TICK; 4350 $LOAD = ($NOW - $TICK_START) / $TICK;
3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3847 4352
3848 if (0) { 4353 if (0) {
3849 if ($NEXT_TICK) { 4354 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4355 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4356 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4357 debug "jitter $JITTER\n";#d#
3853 } 4358 }
3854 } 4359 }
3855} 4360}
3856 4361
3857{ 4362{
3858 # configure BDB 4363 # configure BDB
4364 info "initialising database";
3859 4365
3860 BDB::min_parallel 8; 4366 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4367 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4368 #$AnyEvent::BDB::WATCHER->priority (1);
3863 4369
3864 unless ($DB_ENV) { 4370 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4371 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4373 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4398 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 }; 4399 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4400 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4401 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 }; 4402 };
4403
4404 info "database initialised";
3897} 4405}
3898 4406
3899{ 4407{
3900 # configure IO::AIO 4408 # configure IO::AIO
3901 4409
4410 info "initialising aio";
3902 IO::AIO::min_parallel 8; 4411 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4412 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4413 undef $AnyEvent::AIO::WATCHER;
4414 info "aio initialised";
3905} 4415}
3906 4416
3907my $_log_backtrace; 4417our $_log_backtrace;
4418our $_log_backtrace_last;
3908 4419
3909sub _log_backtrace { 4420sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4421 my ($msg, @addr) = @_;
3911 4422
3912 $msg =~ s/\n//; 4423 $msg =~ s/\n$//;
3913 4424
4425 if ($_log_backtrace_last eq $msg) {
4426 LOG llevInfo, "[ABT] $msg\n";
4427 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4428 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4429 } elsif ($_log_backtrace < 2) {
4430 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4431 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4432 my $perl_bt = Carp::longmess $msg;
3918 async { 4433 async {
3919 $Coro::current->{desc} = "abt $msg"; 4434 $Coro::current->{desc} = "abt $msg";
3920 4435
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4455 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4456 --$_log_backtrace;
3942 }; 4457 };
3943 } else { 4458 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4459 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4460 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4461 }
3947} 4462}
3948 4463
3949# load additional modules 4464# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4465require "cf/$_.pm" for @EXTRA_MODULES;
4466cf::_connect_to_perl_2;
3951 4467
3952END { cf::emergency_save } 4468END { cf::emergency_save }
3953 4469
39541 44701
3955 4471

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines