ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines