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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 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 ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
36 40
37use Coro (); 41use Coro ();
38use Coro::State; 42use Coro::State;
39use Coro::Handle; 43use Coro::Handle;
40use Coro::EV; 44use Coro::EV;
41use Coro::AnyEvent; 45use Coro::AnyEvent;
42use Coro::Timer; 46use Coro::Timer;
43use Coro::Signal; 47use Coro::Signal;
44use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
45use Coro::AnyEvent; 50use Coro::AnyEvent;
46use Coro::AIO; 51use Coro::AIO;
47use Coro::BDB 1.6; 52use Coro::BDB 1.6;
48use Coro::Storable; 53use Coro::Storable;
49use Coro::Util (); 54use Coro::Util ();
50 55
56use Guard ();
51use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
52use BDB (); 58use BDB ();
53use Data::Dumper; 59use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 60use Fcntl;
56use YAML (); 61use YAML::XS ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes; 63use Time::HiRes;
59use Compress::LZF; 64use Compress::LZF;
60use Digest::MD5 (); 65use Digest::MD5 ();
61 66
70 75
71# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
76 86
77our %COMMAND = (); 87our %COMMAND = ();
78our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
79 89
80our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
85 95
86our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
88 100
89our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
90our $DATADIR = datadir; 103our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
94our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 116
103our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
104 124
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 127our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
109 129
110our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 133our $DB_ENV;
114 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
115our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 139
117our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
119our $NOW; 143our $NOW;
120 144
121our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
129our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 154our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
132 156
133our @POST_INIT; 157our @POST_INIT;
158
159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
134 164
135binmode STDOUT; 165binmode STDOUT;
136binmode STDERR; 166binmode STDERR;
137 167
138# read virtual server time, if available 168# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
143} 173}
144 174
175eval "sub TICK() { $TICK } 1" or die;
176
145mkdir $_ 177mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 179
148our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
149 181
150sub cf::map::normalise; 182sub cf::map::normalise;
151 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
152############################################################################# 188#############################################################################
153 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
154=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
155 202
156=over 4 203=over 4
157 204
158=item $cf::UPTIME 205=item $cf::UPTIME
159 206
160The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
161 223
162=item $cf::RUNTIME 224=item $cf::RUNTIME
163 225
164The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
165every server tick. 227every server tick.
171Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
174database environment. 236database environment.
175 237
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 238=item $cf::LOADAVG
185 239
186The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
187(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
188objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
197from wherever your confdir points to. 251from wherever your confdir points to.
198 252
199=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
200 254
201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
202returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
205=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
206 277
207This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 280that call.
210 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
211=back 288=back
212 289
213=cut 290=cut
214 291
215BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 299 my $msg = join "", @_;
218 300
219 $msg .= "\n" 301 $msg .= "\n"
220 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
221 303
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 305
224 LOG llevError, $msg; 306 LOG llevWarn, $msg;
225 }; 307};
226}
227 308
228$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
230 311
231 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 316 return;#d#
234 }#d# 317 }#d#
235 318
236 # kill coroutine otherwise 319 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 320 Coro::terminate
239}; 321};
240
241$SIG{__DIE__} = sub { }; #d#?
242 322
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 340)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 342}
263 343
264$EV::DIED = sub { 344$EV::DIED = sub {
265 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
266}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
267 352
268############################################################################# 353#############################################################################
269 354
270=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
271 356
292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
293 $d 378 $d
294 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
295} 380}
296 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
297=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
298 435
299Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
300 437
301=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308 445
309sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
311 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
312=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
313 481
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
316 484
317The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 486is a reload or not.
319 487
320=cut 488=cut
321 489
322sub post_init(&) { 490sub post_init(&) {
323 push @POST_INIT, shift; 491 push @POST_INIT, shift;
324} 492}
325 493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
509}
510
326=item cf::lock_wait $string 511=item cf::lock_wait $string
327 512
328Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
329 514
330=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
331 516
332Wait until the given lock is available and then acquires it and returns 517Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 518a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
335returned. 520returned.
336 521
337Locks are *not* recursive, locking from the same coro twice results in a 522Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 523deadlocked coro.
344 529
345Return true if the lock is currently active, i.e. somebody has locked it. 530Return true if the lock is currently active, i.e. somebody has locked it.
346 531
347=cut 532=cut
348 533
349our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 535
352sub lock_wait($) { 536sub lock_wait($) {
353 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 538}
367 539
368sub lock_acquire($) { 540sub lock_acquire($) {
369 my ($key) = @_; 541 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 542}
383 543
384sub lock_active($) { 544sub lock_active($) {
385 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 546}
389 547
390sub freeze_mainloop { 548sub freeze_mainloop {
391 tick_inhibit_inc; 549 tick_inhibit_inc;
392 550
393 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
394} 552}
395 553
396=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
397 555
398Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 557get spread over time.
400 558
401=cut 559=cut
402 560
403sub periodic($$) { 561sub periodic($$) {
404 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
409} 567}
410 568
411=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
412 570
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
414This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
415of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
416 578
417The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
419 581
420Useful for short background jobs. 582Useful for short background jobs.
421 583
422=cut 584=cut
423 585
424our @SLOT_QUEUE; 586our @SLOT_QUEUE;
425our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
426 589
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
430 593
431 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
432 596
433 while () { 597 while () {
434 next_job: 598 next_job:
599
435 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 601
437 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 606 $job->[2]->send;
441 Coro::cede; 607 Coro::cede;
442 goto next_job; 608 goto next_job;
443 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 611 }
445 } 612 }
446 613
447 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
450 $signal->wait;
451 } else { 617 } else {
618 $busy = 0;
452 Coro::schedule; 619 Coro::schedule;
453 } 620 }
454 } 621 }
455}; 622};
456 623
457sub get_slot($;$$) { 624sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
459 626
460 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
461 628
462 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
463 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
464 632
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
493=cut 661=cut
494 662
495sub sync_job(&) { 663sub sync_job(&) {
496 my ($job) = @_; 664 my ($job) = @_;
497 665
498 if ($Coro::current == $Coro::main) { 666 if (in_main) {
499 my $time = EV::time; 667 my $time = AE::time;
500 668
501 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
503 671
504 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
505 673
506 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
507 675
508 my $busy = 1; 676 my $busy = 1;
509 my @res; 677 my @res;
510 678
511 (async { 679 (async {
512 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 681 @res = eval { $job->() };
514 warn $@ if $@; 682 error $@ if $@;
515 undef $busy; 683 undef $busy;
516 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
517 685
518 while ($busy) { 686 while ($busy) {
519 if (Coro::nready) { 687 if (Coro::nready) {
521 } else { 689 } else {
522 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
523 } 691 }
524 } 692 }
525 693
526 my $time = EV::time - $time; 694 my $time = AE::time - $time;
527 695
528 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
529 697
530 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
531 } else { 699 } else {
553 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
554 722
555 $coro 723 $coro
556} 724}
557 725
558=item fork_call { }, $args 726=item fork_call { }, @args
559 727
560Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 731never block itself or use any form of event handling.
564 732
565=cut 733=cut
566 734
735sub post_fork {
736 reset_signals;
737}
738
567sub fork_call(&@) { 739sub fork_call(&@) {
568 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
569 741
570 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
573 745
574 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
575 reset_signals; 747 cf::post_fork;
576 &$cb 748 &$cb
577 }, @args; 749 } @args;
578 750
579 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
580} 763}
581 764
582=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
583 766
584=cut 767=cut
621within each server. 804within each server.
622 805
623=cut 806=cut
624 807
625sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
626 my ($name) = @_; 812 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
628 814
629 eval { 815 eval {
630 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
640} 826}
641 827
642our $DB; 828our $DB;
643 829
644sub db_init { 830sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
647 };
648} 832}
649 833
650sub db_get($$) { 834sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
652 836
653 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
654 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
655 841
656 $! ? () 842 $! ? ()
657 : $data 843 : $data
658 }
659} 844}
660 845
661sub db_put($$$) { 846sub db_put($$$) {
662 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 876
692 my @data; 877 my @data;
693 my $md5; 878 my $md5;
694 879
695 for (0 .. $#$src) { 880 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 882 }
699 883
700 # if processing is expensive, check 884 # if processing is expensive, check
701 # checksum first 885 # checksum first
702 if (1) { 886 if (1) {
719 903
720 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 905 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
723 907
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 909
726 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
729 913
739 923
740=cut 924=cut
741 925
742sub datalog($@) { 926sub datalog($@) {
743 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 929}
746 930
747=back 931=back
748 932
749=cut 933=cut
944 1128
945 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1131
948 } elsif (ref $type) { 1132 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
950 1134
951 } else { 1135 } else {
952 shift @arg; 1136 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
954 } 1138 }
955 } 1139 }
956} 1140}
957 1141
958sub _object_attach { 1142sub _object_attach {
968 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
969 } 1153 }
970 1154
971 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
972 } else { 1156 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1158 }
975 1159
976 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
977} 1161}
978 1162
1037 1221
1038 for (@$callbacks) { 1222 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1040 1224
1041 if ($@) { 1225 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1227 override;
1045 } 1228 }
1046 1229
1047 return 1 if $override; 1230 return 1 if $override;
1048 } 1231 }
1127 for (@$attach) { 1310 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1130 } 1313 }
1131 } else { 1314 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1316 }
1134 } 1317 }
1135} 1318}
1136 1319
1137cf::attachable->attach ( 1320cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1165 1348
1166 sync_job { 1349 sync_job {
1167 if (length $$rdata) { 1350 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1171 1355
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1359 if ($cf::USE_FSYNC) {
1360 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;
1361 aio_fsync $fh;
1362 }
1176 aio_close $fh; 1363 aio_close $fh;
1177 1364
1178 if (@$objs) { 1365 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1366 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1370 if ($cf::USE_FSYNC) {
1371 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;
1372 aio_fsync $fh;
1373 }
1184 aio_close $fh; 1374 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1376 }
1187 } else { 1377 } else {
1188 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1189 } 1379 }
1190 1380
1191 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1192 1382
1193 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1385 } else {
1196 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1197 } 1387 }
1198 } else { 1388 } else {
1199 aio_unlink $filename; 1389 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1201 } 1391 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1416 $av = $st->{objs};
1227 } 1417 }
1228 1418
1229 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1232 1423
1233 ($data, $av) 1424 ($data, $av)
1234} 1425}
1235 1426
1236=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1293 1484
1294 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1295} 1486}
1296 1487
1488use File::Glob ();
1489
1297cf::player->attach ( 1490cf::player->attach (
1298 on_command => sub { 1491 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1300 1493
1301 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1302 or return; 1495 or return;
1303 1496
1311 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1312 1505
1313 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1314 1507
1315 if (ref $msg) { 1508 if (ref $msg) {
1316 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1317 "ARRAY" eq ref $msg
1318 ? @$msg
1319 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1320 1510
1321 my @reply; 1511 my @reply;
1322 1512
1323 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1324 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1326 1516
1327 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1518 if $reply;
1329 1519
1330 } else { 1520 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1522 }
1333 1523
1334 cf::override; 1524 cf::override;
1335 }, 1525 },
1336); 1526);
1337 1527
1528# "readahead" all extensions
1529sub cache_extensions {
1530 my $grp = IO::AIO::aio_group;
1531
1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1533 for (grep /\.ext$/, @{$_[0]}) {
1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1535 }
1536 };
1537
1538 $grp
1539}
1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1338sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1339 cf::sync_job { 1557 cf::sync_job {
1340 my %todo; 1558 my %todo;
1341 1559
1342 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1561 next unless -r $path;
1361 1579
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1582
1365 $ext{source} = 1583 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1368 . $source 1586 . $source
1369 . "\n};\n1"; 1587 . "\n};\n1";
1370 1588
1371 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1372 } 1590 }
1373 1591
1592 my $pass = 0;
1374 my %done; 1593 my %done;
1375 while (%todo) { 1594 while (%todo) {
1376 my $progress; 1595 my $progress;
1377 1596
1597 ++$pass;
1598
1599 ext:
1378 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1602 next ext
1381 unless exists $done{$_}; 1603 unless exists $done{$_};
1382 } 1604 }
1383 1605
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1607
1386 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1621
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1623 if exists $v->{meta}{mandatory};
1394 1624
1395 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1396 } 1634 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1635 }
1402 1636
1403 skip: 1637 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1406 } 1647 }
1407 }; 1648 };
1408} 1649}
1409 1650
1410############################################################################# 1651#############################################################################
1494 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1495 } 1736 }
1496 } 1737 }
1497} 1738}
1498 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1499sub save($) { 1753sub save($) {
1500 my ($pl) = @_; 1754 my ($pl) = @_;
1501 1755
1502 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1503 1757
1508 1762
1509 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1511 1765
1512 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1770
1514 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1772 cf::cede_to_tick;
1516} 1773}
1517 1774
1551 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1552 1809
1553 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1555 1812
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1814 $pl->deactivate;
1815
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1561 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1562 1821
1563 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1619 \@logins 1878 \@logins
1620} 1879}
1621 1880
1622=item $player->maps 1881=item $player->maps
1623 1882
1883=item cf::player::maps $login
1884
1624Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1625player. May block. 1886player. May block.
1626 1887
1627=cut 1888=cut
1628 1889
1690=cut 1951=cut
1691 1952
1692sub find_by_path($) { 1953sub find_by_path($) {
1693 my ($path) = @_; 1954 my ($path) = @_;
1694 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1695 my ($match, $specificity); 1958 my ($match, $specificity);
1696 1959
1697 for my $region (list) { 1960 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1727sub generate_random_map { 1990sub generate_random_map {
1728 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1729 1992
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 1994
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1996}
1747 1997
1748=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1749 1999
1750Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1755 2005
1756sub register { 2006sub register {
1757 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 2008 my $pkg = caller;
1759 2009
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 2011
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 2013}
1765 2014
1766# also paths starting with '/' 2015# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 2017
1769sub thawer_merge { 2018sub thawer_merge {
1770 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1771 2020
1772 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1777} 2026}
1778 2027
1779sub normalise { 2028sub normalise {
1780 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1781 2030
1782 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1783 2032
1784 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1785 2034
1786 # map plan: 2035 # map plan:
1787 # 2036 #
1802 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 2052 $path = "$base/$path";
1804 } 2053 }
1805 2054
1806 for ($path) { 2055 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1810 } 2058 }
1811 2059
1812 $path 2060 $path
1826 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1827 return $self; 2075 return $self;
1828 } 2076 }
1829 } 2077 }
1830 2078
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2080 ()
1833} 2081}
1834 2082
2083# may re-bless or do other evil things
1835sub init { 2084sub init {
1836 my ($self) = @_; 2085 my ($self) = @_;
1837 2086
1838 $self 2087 $self
1839} 2088}
1870 2119
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2120 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2121 "$UNIQUEDIR/$path"
1873} 2122}
1874 2123
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 2124sub decay_objects {
1885 my ($self) = @_; 2125 my ($self) = @_;
1886 2126
1887 return if $self->{deny_reset}; 2127 return if $self->{deny_reset};
1888 2128
1913 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1914 2154
1915 1 2155 1
1916} 2156}
1917 2157
2158# used to laod the header of an original map
1918sub load_header_orig { 2159sub load_header_orig {
1919 my ($self) = @_; 2160 my ($self) = @_;
1920 2161
1921 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1922} 2163}
1923 2164
2165# used to laod the header of an instantiated map
1924sub load_header_temp { 2166sub load_header_temp {
1925 my ($self) = @_; 2167 my ($self) = @_;
1926 2168
1927 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1928} 2170}
1929 2171
2172# called after loading the header from an instantiated map
1930sub prepare_temp { 2173sub prepare_temp {
1931 my ($self) = @_; 2174 my ($self) = @_;
1932 2175
1933 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1935 # safety 2178 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2181}
1939 2182
2183# called after loading the header from an original map
1940sub prepare_orig { 2184sub prepare_orig {
1941 my ($self) = @_; 2185 my ($self) = @_;
1942 2186
1943 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1968 2212
1969sub find; 2213sub find;
1970sub find { 2214sub find {
1971 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1972 2216
2217 cf::cede_to_tick;
2218
1973 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1974 2220
1975 cf::lock_wait "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2223
1978 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2225 my $map = new_from_path cf::map $path
1983 or return; 2226 or return;
1984 2227
1985 $map->{last_save} = $cf::RUNTIME; 2228 $map->{last_save} = $cf::RUNTIME;
1986 2229
1998 2241
1999 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
2000 } 2243 }
2001} 2244}
2002 2245
2003sub pre_load { } 2246sub pre_load { }
2004sub post_load { } 2247#sub post_load { } # XS
2005 2248
2006sub load { 2249sub load {
2007 my ($self) = @_; 2250 my ($self) = @_;
2008 2251
2009 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2012 2255
2013 { 2256 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2015 2258
2016 return unless $self->valid; 2259 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2261
2021 $self->alloc; 2262 $self->alloc;
2022 2263
2023 $self->pre_load; 2264 $self->pre_load;
2024 cf::cede_to_tick; 2265 cf::cede_to_tick;
2025 2266
2267 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2269 $f->skip_block;
2028 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2029 or return; 2271 or return;
2030 2272
2031 $self->post_load_original 2273 $self->post_load_original
2032 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2033 2275
2034 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2277 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2280 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2041 } 2284 }
2042 } 2285 }
2043 }
2044 2286
2045 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2046 2294
2047 cf::cede_to_tick; 2295 cf::cede_to_tick;
2048 # now do the right thing for maps 2296 # now do the right thing for maps
2049 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2303 $self->decay_objects;
2056 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2057 $self->update_buttons; 2305 $self->update_buttons;
2058 cf::cede_to_tick; 2306 cf::cede_to_tick;
2059 $self->set_darkness_map; 2307 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2308 }
2063 2309
2064 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2312 }
2069 2313
2070 $self->post_load; 2314 $self->post_load;
2071}
2072 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2073sub customise_for { 2322sub customise_for {
2074 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2075 2324
2076 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2326 if $self->per_player;
2080# if $self->per_party; 2329# if $self->per_party;
2081 2330
2082 $self 2331 $self
2083} 2332}
2084 2333
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2334sub find_sync {
2112 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2113 2336
2114 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2115} 2342}
2116 2343
2117sub do_load_sync { 2344sub do_load_sync {
2118 my ($map) = @_; 2345 my ($map) = @_;
2119 2346
2347 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2122 2350
2123 cf::sync_job { $map->load }; 2351 $map->load;
2124} 2352}
2125 2353
2126our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2128 2356
2129sub find_async { 2357sub find_async {
2130 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2131 2359
2132 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2133 2361
2134 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2136 } 2364 }
2137 2365
2138 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2139 2367
2140 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2155 2383
2156 () 2384 ()
2157} 2385}
2158 2386
2387# common code, used by both ->save and ->swapout
2159sub save { 2388sub _save {
2160 my ($self) = @_; 2389 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2390
2164 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2165 2392
2166 return unless $self->dirty; 2393 return unless $self->dirty;
2167 2394
2187 } else { 2414 } else {
2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2189 } 2416 }
2190} 2417}
2191 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2192sub swap_out { 2427sub swap_out {
2193 my ($self) = @_; 2428 my ($self) = @_;
2194 2429
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2200 return if $self->players; 2434 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2202 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2203 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2204 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2205 2486
2206 $self->deactivate; 2487 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2489 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2490
2254 $self->unlink_save; 2491 $self->unlink_save;
2255 $self->destroy; 2492 $self->destroy;
2256} 2493}
2257 2494
2265 2502
2266 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2267 2504
2268 $self->unlink_save; 2505 $self->unlink_save;
2269 2506
2270 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2512
2332 : normalise $_ 2569 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2571 ]
2335} 2572}
2336 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2337=back 2606=back
2338 2607
2339=head3 cf::object 2608=head3 cf::object
2340 2609
2341=cut 2610=cut
2406 2675
2407our $SAY_CHANNEL = { 2676our $SAY_CHANNEL = {
2408 id => "say", 2677 id => "say",
2409 title => "Map", 2678 title => "Map",
2410 reply => "say ", 2679 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2680 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2681};
2413 2682
2414our $CHAT_CHANNEL = { 2683our $CHAT_CHANNEL = {
2415 id => "chat", 2684 id => "chat",
2416 title => "Chat", 2685 title => "Chat",
2473 2742
2474Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2475 2744
2476The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2477for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2479map. 2748map.
2480 2749
2481Will never block. 2750Will never block.
2482 2751
2483=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2505 my ($self) = @_; 2774 my ($self) = @_;
2506 2775
2507 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2508 2777
2778 ++$self->{_link_recursion};
2779
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2781
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2513 2784
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2786}
2516 2787
2517sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2519 2790
2536 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2538 2809
2539 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2542 2813
2543 $map->load; 2814 $map->load;
2544 $map->load_neighbours;
2545 2815
2546 return unless $self->contr->active; 2816 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2817
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2552} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2553 2825
2826}
2827
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2555 2829
2556Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2557her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2558that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2559the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2566 2840
2567our $GOTOGEN; 2841our $GOTOGEN;
2568 2842
2569sub cf::object::player::goto { 2843sub cf::object::player::goto {
2570 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2571 2851
2572 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2854
2575 $self->enter_link; 2855 $self->enter_link;
2595 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2596 } 2876 }
2597 } 2877 }
2598 2878
2599 my $map = eval { 2879 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2601 2881
2602 if ($map) { 2882 if ($map) {
2603 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2885 } else {
2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 } 2887 }
2608 2888
2609 $map 2889 $map
2617 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2620 } 2900 }
2621 2901
2622 $done->() if $done; 2902 $done->($self) if $done;
2623 })->prio (1); 2903 })->prio (1);
2624} 2904}
2625 2905
2626=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2627 2907
2695 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2696 2976
2697 unless (eval { 2977 unless (eval {
2698 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2699 2979
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2709 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2711 3006
2712 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2713 3008
2714 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2720 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2722 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2724 3019
2725 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 3021 $self->leave_link;
2727 } 3022 }
2728 })->prio (1); 3023 })->prio (1);
2729} 3024}
2730 3025
2742sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2744 3039
2745 utf8::encode $text; 3040 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2747} 3067}
2748 3068
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 3070
2751Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2755 3075
2756=cut 3076=cut
2757 3077
2758# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2760 "c/identify" => { 3086 "c/identify" => {
2761 id => "infobox", 3087 id => "infobox",
2762 title => "Identify", 3088 title => "Identify",
2763 reply => undef, 3089 reply => undef,
2764 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2766 "c/examine" => { 3092 "c/examine" => {
2767 id => "infobox", 3093 id => "infobox",
2768 title => "Examine", 3094 title => "Examine",
2769 reply => undef, 3095 reply => undef,
2770 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 3103 },
2772 "c/book" => { 3104 "c/book" => {
2773 id => "infobox", 3105 id => "infobox",
2774 title => "Book", 3106 title => "Book",
2775 reply => undef, 3107 reply => undef,
2791 id => "infobox", 3123 id => "infobox",
2792 title => "Body Parts", 3124 title => "Body Parts",
2793 reply => undef, 3125 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3126 tooltip => "Shows which body parts you posess and are available",
2795 }, 3127 },
3128 "c/statistics" => {
3129 id => "infobox",
3130 title => "Statistics",
3131 reply => undef,
3132 tooltip => "Shows your primary statistics",
3133 },
2796 "c/skills" => { 3134 "c/skills" => {
2797 id => "infobox", 3135 id => "infobox",
2798 title => "Skills", 3136 title => "Skills",
2799 reply => undef, 3137 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 3138 tooltip => "Shows your experience per skill and item power",
3139 },
3140 "c/shopitems" => {
3141 id => "infobox",
3142 title => "Shop Items",
3143 reply => undef,
3144 tooltip => "Shows the items currently for sale in this shop",
3145 },
3146 "c/resistances" => {
3147 id => "infobox",
3148 title => "Resistances",
3149 reply => undef,
3150 tooltip => "Shows your resistances",
3151 },
3152 "c/pets" => {
3153 id => "infobox",
3154 title => "Pets",
3155 reply => undef,
3156 tooltip => "Shows information abotu your pets/a specific pet",
3157 },
3158 "c/perceiveself" => {
3159 id => "infobox",
3160 title => "Perceive Self",
3161 reply => undef,
3162 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3163 },
2802 "c/uptime" => { 3164 "c/uptime" => {
2803 id => "infobox", 3165 id => "infobox",
2804 title => "Uptime", 3166 title => "Uptime",
2805 reply => undef, 3167 reply => undef,
2815 id => "party", 3177 id => "party",
2816 title => "Party", 3178 title => "Party",
2817 reply => "gsay ", 3179 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3180 tooltip => "Messages and chat related to your party",
2819 }, 3181 },
3182 "c/death" => {
3183 id => "death",
3184 title => "Death",
3185 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death",
3187 },
3188 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL,
2820); 3190);
2821 3191
2822sub cf::client::send_msg { 3192sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3193 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3194
2829 3199
2830 # check predefined channels, for the benefit of C 3200 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3201 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3202 $channel = $CHANNEL{$channel};
2833 3203
2834 $self->ext_msg (channel_info => $channel) 3204 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3205 $channel = $channel->{id};
2838 3206
2839 } elsif (ref $channel) { 3207 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3208 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3209 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3210 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3211 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3212 }
2846 3213
2847 $channel = $channel->{id}; 3214 $channel = $channel->{id};
2848 } 3215 }
2849 3216
2850 return unless @extra || length $msg; 3217 return unless @extra || length $msg;
2851 3218
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3219 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3220 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3221 if $color & cf::NDI_DEF;
2856 3222
2857 my $pkt = "msg " 3223 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3226 );
2861 3227
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3229}
2899 3230
2900=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2901 3232
2902Sends an ext event to the client. 3233Sends an ext event to the client.
2905 3236
2906sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2908 3239
2909 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3245 }
2915} 3246}
2916 3247
2917=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2918 3249
2921=cut 3252=cut
2922 3253
2923sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2925 3256
2926 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933} 3260}
2934 3261
2935=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2936 3263
2937Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2992 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2993 3320
2994 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2995 3322
2996 if (ref $msg) { 3323 if (ref $msg) {
2997 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2998 "ARRAY" eq ref $msg
2999 ? @$msg
3000 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3001 3325
3002 my @reply; 3326 my @reply;
3003 3327
3004 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3005 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3007 3331
3008 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3333 if $reply;
3010 3334
3011 } else { 3335 } else {
3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3013 } 3337 }
3014 3338
3015 cf::override; 3339 cf::override;
3016 }, 3340 },
3017); 3341);
3037 3361
3038 $coro 3362 $coro
3039} 3363}
3040 3364
3041cf::client->attach ( 3365cf::client->attach (
3042 on_destroy => sub { 3366 on_client_destroy => sub {
3043 my ($ns) = @_; 3367 my ($ns) = @_;
3044 3368
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3370 },
3047); 3371);
3063our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3064 3388
3065$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3066 3390
3067$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3070 sort time 3394 sort time
3071)); 3395));
3072 3396
3073# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3401The following functions and methods are available within a safe environment:
3078 3402
3079 cf::object 3403 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3404 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3405 insert remove name archname title slaying race decrease split
3406 value
3082 3407
3083 cf::object::player 3408 cf::object::player
3084 player 3409 player
3085 3410
3086 cf::player 3411 cf::player
3092=cut 3417=cut
3093 3418
3094for ( 3419for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3420 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3421 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3424 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3101) { 3426) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3429 for @funs;
3106} 3430}
3107 3431
3122 3446
3123 my $qcode = $code; 3447 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3126 3450
3451 %vars = (_dummy => 0) unless %vars;
3452
3453 my @res;
3127 local $_; 3454 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3455
3130 my $eval = 3456 my $eval =
3131 "do {\n" 3457 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3460 . $code
3135 . "\n}" 3461 . "\n}"
3136 ; 3462 ;
3137 3463
3464 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3141 3473
3142 if ($@) { 3474 if ($@) {
3143 warn "$@"; 3475 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3146 } 3478 }
3147 3479
3148 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3149} 3481}
3150 3482
3164=cut 3496=cut
3165 3497
3166sub register_script_function { 3498sub register_script_function {
3167 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3168 3500
3169 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3171} 3503}
3172 3504
3173=back 3505=back
3174 3506
3175=cut 3507=cut
3176 3508
3177############################################################################# 3509#############################################################################
3178# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3179 3535
3180sub load_facedata($) { 3536sub load_facedata($) {
3181 my ($path) = @_; 3537 my ($path) = @_;
3182 3538
3183 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?) 3540 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3542
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3544
3189 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3190 3546
3191 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3548
3197 $facedata->{version} == 2 3549 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3551
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick; 3552 cf::cede_to_tick;
3206 3553
3207 { 3554 {
3208 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3209 3556
3210 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3560
3213 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3217 3567
3218 cf::cede_to_tick; 3568 cf::cede_to_tick;
3219 } 3569 }
3220 3570
3221 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
3226 3576
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3580 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3582 }
3233 3583
3234 cf::cede_to_tick; 3584 cf::cede_to_tick;
3235 } 3585 }
3236 } 3586 }
3245 3595
3246 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3247 } 3597 }
3248 3598
3249 { 3599 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3253 3601
3254 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3606
3259 if ($info->{type} & 1) {
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3607 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3274 } else { 3611 } else {
3275 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3276 } 3613 }
3277 3614
3278 cf::cede_to_tick; 3615 cf::cede_to_tick;
3279 } 3616 }
3280 } 3617 }
3281 3618
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3620
3284 1 3621 1
3285} 3622}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3623
3307register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3309 3626
3310 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
3318 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3637 cf::arch::commit_load;
3321 3638
3322 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3323} 3653}
3324 3654
3325sub reload_regions { 3655sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?) 3657 # for this (global event?)
3342} 3672}
3343 3673
3344sub reload_archetypes { 3674sub reload_archetypes {
3345 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3346 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3347} 3686}
3348 3687
3349sub reload_treasures { 3688sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3352} 3691}
3353 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3354sub reload_resources { 3713sub reload_resources {
3355 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3356 3715
3716 reload_materials;
3357 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3358 reload_archetypes; 3720 reload_archetypes;
3359 reload_regions; 3721 reload_regions;
3360 reload_treasures; 3722 reload_treasures;
3361 3723
3362 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3363} 3725}
3364 3726
3365sub reload_config { 3727sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3728 trace "reloading config file...\n";
3367 or return;
3368 3729
3369 local $/; 3730 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3371 3733
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3735
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3738
3377 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
3400 3762
3401 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3402 print $fh $$; 3764 print $fh $$;
3403} 3765}
3404 3766
3767sub main_loop {
3768 trace "EV::loop starting\n";
3769 if (1) {
3770 EV::loop;
3771 }
3772 trace "EV::loop returned\n";
3773 goto &main_loop unless $REALLY_UNLOOP;
3774}
3775
3405sub main { 3776sub main {
3406 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3407 3778
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412 3783
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3785
3421 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3424 (async { 3789 (async {
3425 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3427 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3428 }; 3793 };
3429 3794
3430 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3431 3796
3432 cf::sync_job { 3797 cf::sync_job {
3798 cf::incloader::init ();
3799
3800 cf::init_anim;
3801 cf::init_attackmess;
3802 cf::init_dynamic;
3803
3804 cf::load_settings;
3805
3433 reload_resources; 3806 reload_resources;
3434 reload_config; 3807 reload_config;
3435 db_init; 3808 db_init;
3436 3809
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3810 cf::init_uuid;
3440 cf::init_signals; 3811 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3812 cf::init_skills;
3443 3813
3444 cf::init_beforeplay; 3814 cf::init_beforeplay;
3445 3815
3446 atomic; 3816 atomic;
3448 load_extensions; 3818 load_extensions;
3449 3819
3450 utime time, time, $RUNTIMEFILE; 3820 utime time, time, $RUNTIMEFILE;
3451 3821
3452 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3823 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3825
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3456 }; 3827 };
3457 3828
3458 EV::loop; 3829 cf::object::thawer::errors_are_fatal 0;
3830 info "parse errors in files are no longer fatal from this point on.\n";
3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3836 goto &main_loop;
3459} 3837}
3460 3838
3461############################################################################# 3839#############################################################################
3462# initialisation and cleanup 3840# initialisation and cleanup
3463 3841
3464# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3465BEGIN { 3843BEGIN {
3466 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3470 }; 3848 };
3471 } 3849 }
3472} 3850}
3473 3851
3474sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3475 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3477 3857
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3859
3480 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3481 3861
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3863 or return;
3484 3864
3485 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
3500 or return; 3880 or return;
3501 3881
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3883 and return;
3504 3884
3505 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3886
3507 1 3887 1
3508} 3888}
3509 3889
3510our $uuid_lock; 3890our $uuid_lock;
3522 or return; 3902 or return;
3523 3903
3524 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3525 3905
3526 unless ($value) { 3906 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3908 return;
3529 } 3909 }
3530 3910
3531 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3912 $uuid_skip = 0;
3542 or return; 3922 or return;
3543 3923
3544 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3545 and return; 3925 and return;
3546 3926
3547 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3548 3928
3549 1 3929 1
3550 3930
3551} 3931}
3552 3932
3558} 3938}
3559 3939
3560sub emergency_save() { 3940sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3562 3942
3563 warn "enter emergency perl save\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3564 3949
3565 cf::sync_job { 3950 cf::sync_job {
3951 cf::write_runtime_sync; # external watchdog should not bark
3952
3566 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3959 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3961 $pl->save;
3575 } 3962 }
3576 warn "end emergency player save\n"; 3963 info "emergency_perl_save: end player save\n";
3577 3964
3578 warn "begin emergency map save\n"; 3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3967 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3970 $map->valid or next;
3582 $map->save; 3971 $map->save;
3583 } 3972 }
3584 warn "end emergency map save\n"; 3973 info "emergency_perl_save: end map save\n";
3585 3974
3586 warn "begin emergency database checkpoint\n"; 3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3977 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3589 3980
3590 warn "begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3982 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 4003 };
3594 4004
3595 warn "leave emergency perl save\n"; 4005 info "emergency_perl_save: leave\n";
3596} 4006}
3597 4007
3598sub post_cleanup { 4008sub post_cleanup {
3599 my ($make_core) = @_; 4009 my ($make_core) = @_;
3600 4010
4011 IO::AIO::flush;
4012
3601 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 4014 if $make_core;
3603 4015
3604 my $fh = pidfile; 4016 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3606} 4018}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 4042 }
3631 warn "cleared package $pkg\n";#d#
3632} 4043}
3633 4044
3634sub do_reload_perl() { 4045sub do_reload_perl() {
3635 # can/must only be called in main 4046 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3637 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3638 return; 4049 return;
3639 } 4050 }
3640 4051
3641 return if $RELOAD++; 4052 return if $RELOAD++;
3642 4053
4054 my $t1 = AE::time;
4055
3643 while ($RELOAD) { 4056 while ($RELOAD) {
3644 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3645 4059
3646 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3647 4061
3648 cf::sync_job { 4062 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 4063 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 4064
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 4067 %EXT_CORO = ();
3666 4068
3667 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3668 %COMMAND = (); 4070 %COMMAND = ();
3669 4071
3670 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 4073 %EXTCMD = ();
3672 %EXTICMD = (); 4074 %EXTICMD = ();
3673 4075
3674 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3677 4079
3678 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3679 eval { 4081 eval {
3680 $cb->($pkg); 4082 $cb->($pkg);
3681 1 4083 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3683 } 4085 }
3684 4086
3685 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3686 clear_package $pkg; 4088 clear_package $pkg;
3687 } 4089 }
3688 4090
3689 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 4094
3693 warn "... unloading $k"; 4095 trace "... unloading $k";
3694 delete $INC{$k}; 4096 delete $INC{$k};
3695 4097
3696 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3698 4100
3701 } 4103 }
3702 4104
3703 clear_package $k; 4105 clear_package $k;
3704 } 4106 }
3705 4107
3706 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 4109 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 4111
3710 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 4115
3714 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4117 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3717 4119
3718 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3719 4121
3720 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3721 require cf; 4123 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4124 cf::_connect_to_perl_1;
3723 4125
3724 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4127 cf::reload_config;
3726 4128
3727 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4130 cf::load_extensions;
3729 4131
4132 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
4139 }
3736 4140
3737 warn "running post_load"; 4141 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4142
3740 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3741 4144
3742 1 4145 1
3743 } or do { 4146 } or do {
3744 warn $@; 4147 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3746 }; 4149 };
3747 4150
3748 warn "reloaded";
3749 --$RELOAD; 4151 --$RELOAD;
3750 } 4152 }
4153
4154 $t1 = AE::time - $t1;
4155 info "perl_reload: completed in ${t1}s\n";
3751}; 4156};
3752 4157
3753our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3754 4159
3755sub reload_perl() { 4160sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4161 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3758 4163
4164 $RELOAD_WATCHER ||= cf::async {
4165 Coro::AIO::aio_wait cache_extensions;
4166
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4168 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
4170 };
3762 }; 4171 };
3763} 4172}
3764 4173
3765register_command "reload" => sub { 4174register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4175 my ($who, $arg) = @_;
3772 reload_perl; 4181 reload_perl;
3773 }; 4182 };
3774 } 4183 }
3775}; 4184};
3776 4185
3777unshift @INC, $LIBDIR; 4186#############################################################################
3778 4187
3779my $bug_warning = 0; 4188my $bug_warning = 0;
3780 4189
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4190sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4192
3787 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4194}
3791 4195
3792sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4198
3795 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4201 $signal->wait;
3798} 4202}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3804 return; 4208 return;
3805 } 4209 }
3806 4210
3807 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
4212
4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4214
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4217 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4219 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3815 }; 4221 };
3816 } 4222 }
3817 4223
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4225 $sig->send;
3820 } 4226 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4228
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4231
3828 if (0) { 4232 if (0) {
3829 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3833 } 4237 }
3834 } 4238 }
3835} 4239}
3836 4240
3837{ 4241{
3838 # configure BDB 4242 # configure BDB
3839 4243
3840 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4247
3844 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3885} 4289}
3886 4290
3887my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3888 4293
3889sub _log_backtrace { 4294sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3891 4296
3892 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3893 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4305 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3898 async { 4307 async {
3899 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
3900 4309
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4330 --$_log_backtrace;
3922 }; 4331 };
3923 } else { 4332 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4335 }
3927} 4336}
3928 4337
3929# load additional modules 4338# load additional modules
3930use cf::pod; 4339require "cf/$_.pm" for @EXTRA_MODULES;
4340cf::_connect_to_perl_2;
3931 4341
3932END { cf::emergency_save } 4342END { cf::emergency_save }
3933 4343
39341 43441
3935 4345

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines