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.449 by root, Sat Sep 20 00:09:27 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
81our %EXTCMD = (); 91our %EXTCMD = ();
82our %EXTICMD = (); 92our %EXTICMD = ();
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 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
127 151
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
156
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;
132 164
133binmode STDOUT; 165binmode STDOUT;
134binmode STDERR; 166binmode STDERR;
135 167
136# read virtual server time, if available 168# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
141} 173}
142 174
175eval "sub TICK() { $TICK } 1" or die;
176
143mkdir $_ 177mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 179
146our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
147 181
148sub cf::map::normalise; 182sub cf::map::normalise;
149 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
150############################################################################# 188#############################################################################
151 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
152=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
153 202
154=over 4 203=over 4
155 204
156=item $cf::UPTIME 205=item $cf::UPTIME
157 206
158The 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.
159 223
160=item $cf::RUNTIME 224=item $cf::RUNTIME
161 225
162The 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
163every server tick. 227every server tick.
169Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
170directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
172database environment. 236database environment.
173 237
174=item $cf::NOW
175
176The time of the last (current) server tick.
177
178=item $cf::TICK
179
180The interval between server ticks, in seconds.
181
182=item $cf::LOADAVG 238=item $cf::LOADAVG
183 239
184The 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
185(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
186objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
195from wherever your confdir points to. 251from wherever your confdir points to.
196 252
197=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
198 254
199These 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
200returns 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
201per 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.
202 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
203=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
204 277
205This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 280that call.
208 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
209=back 288=back
210 289
211=cut 290=cut
212 291
213BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 299 my $msg = join "", @_;
216 300
217 $msg .= "\n" 301 $msg .= "\n"
218 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
219 303
220 $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;
221 305
222 LOG llevError, $msg; 306 LOG llevWarn, $msg;
223 }; 307};
224}
225 308
226$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
228 311
229 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 316 return;#d#
232 }#d# 317 }#d#
233 318
234 # kill coroutine otherwise 319 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 320 Coro::terminate
237}; 321};
238
239$SIG{__DIE__} = sub { }; #d#?
240 322
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 340)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 342}
261 343
262$EV::DIED = sub { 344$EV::DIED = sub {
263 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
264}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
265 352
266############################################################################# 353#############################################################################
267 354
268=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
269 356
290 $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;
291 $d 378 $d
292 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
293} 380}
294 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
295=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
296 435
297Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
298 437
299=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
305our $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
306 445
307sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
480=item cf::post_init { BLOCK }
481
482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
483but I<before> the server starts ticking again.
484
485The codeblock will have a single boolean argument to indicate whether this
486is a reload or not.
487
488=cut
489
490sub post_init(&) {
491 push @POST_INIT, shift;
492}
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
310=item cf::lock_wait $string 511=item cf::lock_wait $string
311 512
312Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
313 514
314=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
315 516
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
319returned. 520returned.
320 521
321Locks 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
322deadlocked coro. 523deadlocked coro.
328 529
329Return 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.
330 531
331=cut 532=cut
332 533
333our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 535
336sub lock_wait($) { 536sub lock_wait($) {
337 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 538}
350 539
351sub lock_acquire($) { 540sub lock_acquire($) {
352 my ($key) = @_; 541 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 542}
366 543
367sub lock_active($) { 544sub lock_active($) {
368 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 546}
372 547
373sub freeze_mainloop { 548sub freeze_mainloop {
374 tick_inhibit_inc; 549 tick_inhibit_inc;
375 550
376 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
377} 552}
378 553
379=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
380 555
381Like 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
382get spread over timer. 557get spread over time.
383 558
384=cut 559=cut
385 560
386sub periodic($$) { 561sub periodic($$) {
387 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
391 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
392} 567}
393 568
394=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
395 570
396Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
397This 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
398of 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.
399 578
400The 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
401used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
402 581
403Useful for short background jobs. 582Useful for short background jobs.
404 583
405=cut 584=cut
406 585
407our @SLOT_QUEUE; 586our @SLOT_QUEUE;
408our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
409 589
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
413 593
414 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
415 596
416 while () { 597 while () {
417 next_job: 598 next_job:
599
418 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 601
420 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 606 $job->[2]->send;
424 Coro::cede; 607 Coro::cede;
425 goto next_job; 608 goto next_job;
426 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 611 }
428 } 612 }
429 613
430 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
433 $signal->wait;
434 } else { 617 } else {
618 $busy = 0;
435 Coro::schedule; 619 Coro::schedule;
436 } 620 }
437 } 621 }
438}; 622};
439 623
440sub get_slot($;$$) { 624sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
442 626
443 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
444 628
445 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
446 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
447 632
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
476=cut 661=cut
477 662
478sub sync_job(&) { 663sub sync_job(&) {
479 my ($job) = @_; 664 my ($job) = @_;
480 665
481 if ($Coro::current == $Coro::main) { 666 if (in_main) {
482 my $time = EV::time; 667 my $time = AE::time;
483 668
484 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
486 671
487 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
488 673
489 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
490 675
491 my $busy = 1; 676 my $busy = 1;
492 my @res; 677 my @res;
493 678
494 (async { 679 (async {
495 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 681 @res = eval { $job->() };
497 warn $@ if $@; 682 error $@ if $@;
498 undef $busy; 683 undef $busy;
499 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
500 685
501 while ($busy) { 686 while ($busy) {
502 if (Coro::nready) { 687 if (Coro::nready) {
504 } else { 689 } else {
505 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
506 } 691 }
507 } 692 }
508 693
509 my $time = EV::time - $time; 694 my $time = AE::time - $time;
510 695
511 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
512 697
513 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
514 } else { 699 } else {
536 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
537 722
538 $coro 723 $coro
539} 724}
540 725
541=item fork_call { }, $args 726=item fork_call { }, @args
542 727
543Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 731never block itself or use any form of event handling.
547 732
548=cut 733=cut
549 734
735sub post_fork {
736 reset_signals;
737}
738
550sub fork_call(&@) { 739sub fork_call(&@) {
551 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
552 741
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
556 745
557 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
558 reset_signals; 747 cf::post_fork;
559 &$cb 748 &$cb
560 }, @args; 749 } @args;
561 750
562 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 )
563} 763}
564 764
565=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
566 766
567=cut 767=cut
604within each server. 804within each server.
605 805
606=cut 806=cut
607 807
608sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
609 my ($name) = @_; 812 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
611 814
612 eval { 815 eval {
613 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
623} 826}
624 827
625our $DB; 828our $DB;
626 829
627sub db_init { 830sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
630 };
631} 832}
632 833
633sub db_get($$) { 834sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
635 836
636 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
637 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
638 841
639 $! ? () 842 $! ? ()
640 : $data 843 : $data
641 }
642} 844}
643 845
644sub db_put($$$) { 846sub db_put($$$) {
645 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
674 876
675 my @data; 877 my @data;
676 my $md5; 878 my $md5;
677 879
678 for (0 .. $#$src) { 880 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
680 or Carp::croak "$src->[$_]: $!";
681 } 882 }
682 883
683 # if processing is expensive, check 884 # if processing is expensive, check
684 # checksum first 885 # checksum first
685 if (1) { 886 if (1) {
702 903
703 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 905 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
706 907
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 909
709 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
712 913
722 923
723=cut 924=cut
724 925
725sub datalog($@) { 926sub datalog($@) {
726 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 929}
729 930
730=back 931=back
731 932
732=cut 933=cut
927 1128
928 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1131
931 } elsif (ref $type) { 1132 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
933 1134
934 } else { 1135 } else {
935 shift @arg; 1136 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
937 } 1138 }
938 } 1139 }
939} 1140}
940 1141
941sub _object_attach { 1142sub _object_attach {
951 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
952 } 1153 }
953 1154
954 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
955 } else { 1156 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1158 }
958 1159
959 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
960} 1161}
961 1162
1020 1221
1021 for (@$callbacks) { 1222 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1023 1224
1024 if ($@) { 1225 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1227 override;
1028 } 1228 }
1029 1229
1030 return 1 if $override; 1230 return 1 if $override;
1031 } 1231 }
1110 for (@$attach) { 1310 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1113 } 1313 }
1114 } else { 1314 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1316 }
1117 } 1317 }
1118} 1318}
1119 1319
1120cf::attachable->attach ( 1320cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1148 1348
1149 sync_job { 1349 sync_job {
1150 if (length $$rdata) { 1350 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1154 1355
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1363 aio_close $fh;
1160 1364
1161 if (@$objs) { 1365 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1374 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1376 }
1170 } else { 1377 } else {
1171 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1172 } 1379 }
1173 1380
1174 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1385 } else {
1176 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1177 } 1387 }
1178 } else { 1388 } else {
1179 aio_unlink $filename; 1389 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1181 } 1391 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1416 $av = $st->{objs};
1207 } 1417 }
1208 1418
1209 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1212 1423
1213 ($data, $av) 1424 ($data, $av)
1214} 1425}
1215 1426
1216=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1273 1484
1274 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1275} 1486}
1276 1487
1488use File::Glob ();
1489
1277cf::player->attach ( 1490cf::player->attach (
1278 on_command => sub { 1491 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1280 1493
1281 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1282 or return; 1495 or return;
1283 1496
1291 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1292 1505
1293 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1294 1507
1295 if (ref $msg) { 1508 if (ref $msg) {
1296 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1297 "ARRAY" eq ref $msg
1298 ? @$msg
1299 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1300 1510
1301 my @reply; 1511 my @reply;
1302 1512
1303 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1304 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1306 1516
1307 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1518 if $reply;
1309 1519
1310 } else { 1520 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1522 }
1313 1523
1314 cf::override; 1524 cf::override;
1315 }, 1525 },
1316); 1526);
1317 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
1318sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1319 cf::sync_job { 1557 cf::sync_job {
1320 my %todo; 1558 my %todo;
1321 1559
1322 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1561 next unless -r $path;
1341 1579
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1582
1345 $ext{source} = 1583 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1348 . $source 1586 . $source
1349 . "\n};\n1"; 1587 . "\n};\n1";
1350 1588
1351 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1352 } 1590 }
1353 1591
1592 my $pass = 0;
1354 my %done; 1593 my %done;
1355 while (%todo) { 1594 while (%todo) {
1356 my $progress; 1595 my $progress;
1357 1596
1597 ++$pass;
1598
1599 ext:
1358 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1602 next ext
1361 unless exists $done{$_}; 1603 unless exists $done{$_};
1362 } 1604 }
1363 1605
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1607
1366 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 $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1621
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1623 if exists $v->{meta}{mandatory};
1374 1624
1375 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;
1376 } 1634 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1635 }
1382 1636
1383 skip: 1637 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1647 }
1387 }; 1648 };
1388} 1649}
1389 1650
1390############################################################################# 1651#############################################################################
1444 1705
1445sub exists($) { 1706sub exists($) {
1446 my ($login) = @_; 1707 my ($login) = @_;
1447 1708
1448 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1450} 1711}
1451 1712
1452sub find($) { 1713sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1715 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1475 } 1736 }
1476 } 1737 }
1477} 1738}
1478 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
1479sub save($) { 1753sub save($) {
1480 my ($pl) = @_; 1754 my ($pl) = @_;
1481 1755
1482 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1483 1757
1488 1762
1489 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1491 1765
1492 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];
1493 1770
1494 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1772 cf::cede_to_tick;
1496} 1773}
1497 1774
1531 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1532 1809
1533 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1534 $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
1535 1812
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1814 $pl->deactivate;
1815
1538 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;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1541 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1542 1821
1543 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1599 \@logins 1878 \@logins
1600} 1879}
1601 1880
1602=item $player->maps 1881=item $player->maps
1603 1882
1883=item cf::player::maps $login
1884
1604Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1605player. May block. 1886player. May block.
1606 1887
1607=cut 1888=cut
1608 1889
1670=cut 1951=cut
1671 1952
1672sub find_by_path($) { 1953sub find_by_path($) {
1673 my ($path) = @_; 1954 my ($path) = @_;
1674 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1675 my ($match, $specificity); 1958 my ($match, $specificity);
1676 1959
1677 for my $region (list) { 1960 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1707sub generate_random_map { 1990sub generate_random_map {
1708 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1709 1992
1710 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
1711 1994
1712 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1721 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1722 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1723 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1724 (cf::region::find $rmp->{region}), $rmp->{custom}
1725 )
1726} 1996}
1727 1997
1728=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1729 1999
1730Register 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
1735 2005
1736sub register { 2006sub register {
1737 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 2008 my $pkg = caller;
1739 2009
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 2011
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 2013}
1745 2014
1746# also paths starting with '/' 2015# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 2017
1749sub thawer_merge { 2018sub thawer_merge {
1750 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1751 2020
1752 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1757} 2026}
1758 2027
1759sub normalise { 2028sub normalise {
1760 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1761 2030
1762 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1763 2032
1764 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1765 2034
1766 # map plan: 2035 # map plan:
1767 # 2036 #
1782 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 2052 $path = "$base/$path";
1784 } 2053 }
1785 2054
1786 for ($path) { 2055 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1790 } 2058 }
1791 2059
1792 $path 2060 $path
1806 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1807 return $self; 2075 return $self;
1808 } 2076 }
1809 } 2077 }
1810 2078
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 2080 ()
1813} 2081}
1814 2082
2083# may re-bless or do other evil things
1815sub init { 2084sub init {
1816 my ($self) = @_; 2085 my ($self) = @_;
1817 2086
1818 $self 2087 $self
1819} 2088}
1850 2119
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2120 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2121 "$UNIQUEDIR/$path"
1853} 2122}
1854 2123
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 2124sub decay_objects {
1865 my ($self) = @_; 2125 my ($self) = @_;
1866 2126
1867 return if $self->{deny_reset}; 2127 return if $self->{deny_reset};
1868 2128
1893 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1894 2154
1895 1 2155 1
1896} 2156}
1897 2157
2158# used to laod the header of an original map
1898sub load_header_orig { 2159sub load_header_orig {
1899 my ($self) = @_; 2160 my ($self) = @_;
1900 2161
1901 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1902} 2163}
1903 2164
2165# used to laod the header of an instantiated map
1904sub load_header_temp { 2166sub load_header_temp {
1905 my ($self) = @_; 2167 my ($self) = @_;
1906 2168
1907 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1908} 2170}
1909 2171
2172# called after loading the header from an instantiated map
1910sub prepare_temp { 2173sub prepare_temp {
1911 my ($self) = @_; 2174 my ($self) = @_;
1912 2175
1913 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1914 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1915 # safety 2178 # safety
1916 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1917 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1918} 2181}
1919 2182
2183# called after loading the header from an original map
1920sub prepare_orig { 2184sub prepare_orig {
1921 my ($self) = @_; 2185 my ($self) = @_;
1922 2186
1923 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1924 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1948 2212
1949sub find; 2213sub find;
1950sub find { 2214sub find {
1951 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1952 2216
2217 cf::cede_to_tick;
2218
1953 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1954 2220
1955 cf::lock_wait "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2223
1958 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2225 my $map = new_from_path cf::map $path
1963 or return; 2226 or return;
1964 2227
1965 $map->{last_save} = $cf::RUNTIME; 2228 $map->{last_save} = $cf::RUNTIME;
1966 2229
1978 2241
1979 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1980 } 2243 }
1981} 2244}
1982 2245
1983sub pre_load { } 2246sub pre_load { }
1984sub post_load { } 2247#sub post_load { } # XS
1985 2248
1986sub load { 2249sub load {
1987 my ($self) = @_; 2250 my ($self) = @_;
1988 2251
1989 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
1992 2255
1993 { 2256 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
1995 2258
1996 return unless $self->valid; 2259 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2261
2001 $self->alloc; 2262 $self->alloc;
2002 2263
2003 $self->pre_load; 2264 $self->pre_load;
2004 cf::cede_to_tick; 2265 cf::cede_to_tick;
2005 2266
2267 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2269 $f->skip_block;
2008 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2009 or return; 2271 or return;
2010 2272
2011 $self->post_load_original 2273 $self->post_load_original
2012 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2013 2275
2014 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2277 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2280 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2021 } 2284 }
2022 } 2285 }
2023 }
2024 2286
2025 $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);
2026 2294
2027 cf::cede_to_tick; 2295 cf::cede_to_tick;
2028 # now do the right thing for maps 2296 # now do the right thing for maps
2029 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2303 $self->decay_objects;
2036 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2037 $self->update_buttons; 2305 $self->update_buttons;
2038 cf::cede_to_tick; 2306 cf::cede_to_tick;
2039 $self->set_darkness_map; 2307 #$self->activate; # no longer activate maps automatically
2040 cf::cede_to_tick;
2041 $self->activate;
2042 } 2308 }
2043 2309
2044 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2312 }
2049 2313
2050 $self->post_load; 2314 $self->post_load;
2051}
2052 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
2053sub customise_for { 2322sub customise_for {
2054 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2055 2324
2056 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2326 if $self->per_player;
2060# if $self->per_party; 2329# if $self->per_party;
2061 2330
2062 $self 2331 $self
2063} 2332}
2064 2333
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2334sub find_sync {
2092 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2093 2336
2094 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
2095} 2342}
2096 2343
2097sub do_load_sync { 2344sub do_load_sync {
2098 my ($map) = @_; 2345 my ($map) = @_;
2099 2346
2347 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2102 2350
2103 cf::sync_job { $map->load }; 2351 $map->load;
2104} 2352}
2105 2353
2106our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2108 2356
2109sub find_async { 2357sub find_async {
2110 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2111 2359
2112 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2113 2361
2114 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2116 } 2364 }
2117 2365
2118 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2119 2367
2120 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2135 2383
2136 () 2384 ()
2137} 2385}
2138 2386
2387# common code, used by both ->save and ->swapout
2139sub save { 2388sub _save {
2140 my ($self) = @_; 2389 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2390
2144 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2145 2392
2146 return unless $self->dirty; 2393 return unless $self->dirty;
2147 2394
2167 } else { 2414 } else {
2168 $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);
2169 } 2416 }
2170} 2417}
2171 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2172sub swap_out { 2427sub swap_out {
2173 my ($self) = @_; 2428 my ($self) = @_;
2174 2429
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2180 return if $self->players; 2434 return if $self->players;
2181 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
2182 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2183 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
2184 $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};
2185 2486
2186 $self->deactivate; 2487 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2489 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2490
2234 $self->unlink_save; 2491 $self->unlink_save;
2235 $self->destroy; 2492 $self->destroy;
2236} 2493}
2237 2494
2245 2502
2246 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2247 2504
2248 $self->unlink_save; 2505 $self->unlink_save;
2249 2506
2250 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2512
2312 : normalise $_ 2569 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2571 ]
2315} 2572}
2316 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
2317=back 2606=back
2318 2607
2319=head3 cf::object 2608=head3 cf::object
2320 2609
2321=cut 2610=cut
2386 2675
2387our $SAY_CHANNEL = { 2676our $SAY_CHANNEL = {
2388 id => "say", 2677 id => "say",
2389 title => "Map", 2678 title => "Map",
2390 reply => "say ", 2679 reply => "say ",
2391 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.",
2392}; 2681};
2393 2682
2394our $CHAT_CHANNEL = { 2683our $CHAT_CHANNEL = {
2395 id => "chat", 2684 id => "chat",
2396 title => "Chat", 2685 title => "Chat",
2453 2742
2454Freezes 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}>).
2455 2744
2456The 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.
2457for 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,
2458though, 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
2459map. 2748map.
2460 2749
2461Will never block. 2750Will never block.
2462 2751
2463=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2485 my ($self) = @_; 2774 my ($self) = @_;
2486 2775
2487 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2488 2777
2778 ++$self->{_link_recursion};
2779
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2781
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2493 2784
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2786}
2496 2787
2497sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2499 2790
2516 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2518 2809
2519 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2522 2813
2523 $map->load; 2814 $map->load;
2524 $map->load_neighbours;
2525 2815
2526 return unless $self->contr->active; 2816 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2817
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2532} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2533 2825
2826}
2827
2534=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)]])
2535 2829
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2840
2547our $GOTOGEN; 2841our $GOTOGEN;
2548 2842
2549sub cf::object::player::goto { 2843sub cf::object::player::goto {
2550 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 }
2551 2851
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2854
2555 $self->enter_link; 2855 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2576 } 2876 }
2577 } 2877 }
2578 2878
2579 my $map = eval { 2879 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2881
2582 if ($map) { 2882 if ($map) {
2583 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2885 } else {
2586 $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);
2587 } 2887 }
2588 2888
2589 $map 2889 $map
2597 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2600 } 2900 }
2601 2901
2602 $done->() if $done; 2902 $done->($self) if $done;
2603 })->prio (1); 2903 })->prio (1);
2604} 2904}
2605 2905
2606=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2607 2907
2675 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2676 2976
2677 unless (eval { 2977 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2679 2979
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2690 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 }
2691 3006
2692 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2693 3008
2694 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "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. "
2702 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2704 3019
2705 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 3021 $self->leave_link;
2707 } 3022 }
2708 })->prio (1); 3023 })->prio (1);
2709} 3024}
2710 3025
2722sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2724 3039
2725 utf8::encode $text; 3040 utf8::encode $text;
2726 $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);
2727} 3067}
2728 3068
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3070
2731Send 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
2735 3075
2736=cut 3076=cut
2737 3077
2738# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2740 "c/identify" => { 3086 "c/identify" => {
2741 id => "infobox", 3087 id => "infobox",
2742 title => "Identify", 3088 title => "Identify",
2743 reply => undef, 3089 reply => undef,
2744 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2746 "c/examine" => { 3092 "c/examine" => {
2747 id => "infobox", 3093 id => "infobox",
2748 title => "Examine", 3094 title => "Examine",
2749 reply => undef, 3095 reply => undef,
2750 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",
2751 }, 3103 },
2752 "c/book" => { 3104 "c/book" => {
2753 id => "infobox", 3105 id => "infobox",
2754 title => "Book", 3106 title => "Book",
2755 reply => undef, 3107 reply => undef,
2771 id => "infobox", 3123 id => "infobox",
2772 title => "Body Parts", 3124 title => "Body Parts",
2773 reply => undef, 3125 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3126 tooltip => "Shows which body parts you posess and are available",
2775 }, 3127 },
3128 "c/statistics" => {
3129 id => "infobox",
3130 title => "Statistics",
3131 reply => undef,
3132 tooltip => "Shows your primary statistics",
3133 },
3134 "c/skills" => {
3135 id => "infobox",
3136 title => "Skills",
3137 reply => undef,
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",
3163 },
2776 "c/uptime" => { 3164 "c/uptime" => {
2777 id => "infobox", 3165 id => "infobox",
2778 title => "Uptime", 3166 title => "Uptime",
2779 reply => undef, 3167 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 3168 tooltip => "How long the server has been running since last restart",
2789 id => "party", 3177 id => "party",
2790 title => "Party", 3178 title => "Party",
2791 reply => "gsay ", 3179 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 3180 tooltip => "Messages and chat related to your party",
2793 }, 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,
2794); 3190);
2795 3191
2796sub cf::client::send_msg { 3192sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 3193 my ($self, $channel, $msg, $color, @extra) = @_;
2798 3194
2803 3199
2804 # check predefined channels, for the benefit of C 3200 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 3201 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 3202 $channel = $CHANNEL{$channel};
2807 3203
2808 $self->ext_msg (channel_info => $channel) 3204 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 3205 $channel = $channel->{id};
2812 3206
2813 } elsif (ref $channel) { 3207 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 3208 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 3209 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 3210 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 3211 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 3212 }
2820 3213
2821 $channel = $channel->{id}; 3214 $channel = $channel->{id};
2822 } 3215 }
2823 3216
2824 return unless @extra || length $msg; 3217 return unless @extra || length $msg;
2825 3218
2826 if ($self->can_msg) {
2827 # default colour, mask it out 3219 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3220 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 3221 if $color & cf::NDI_DEF;
2830 3222
2831 my $pkt = "msg " 3223 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 3226 );
2835 3227
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 3229}
2873 3230
2874=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2875 3232
2876Sends an ext event to the client. 3233Sends an ext event to the client.
2879 3236
2880sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2881 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2882 3239
2883 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2886 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 } 3245 }
2889} 3246}
2890 3247
2891=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2892 3249
2895=cut 3252=cut
2896 3253
2897sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2899 3256
2900 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 }
2907} 3260}
2908 3261
2909=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2910 3263
2911Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2966 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2967 3320
2968 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2969 3322
2970 if (ref $msg) { 3323 if (ref $msg) {
2971 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2972 "ARRAY" eq ref $msg
2973 ? @$msg
2974 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2975 3325
2976 my @reply; 3326 my @reply;
2977 3327
2978 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
2979 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
2981 3331
2982 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
2983 if $reply; 3333 if $reply;
2984 3334
2985 } else { 3335 } else {
2986 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";
2987 } 3337 }
2988 3338
2989 cf::override; 3339 cf::override;
2990 }, 3340 },
2991); 3341);
3011 3361
3012 $coro 3362 $coro
3013} 3363}
3014 3364
3015cf::client->attach ( 3365cf::client->attach (
3016 on_destroy => sub { 3366 on_client_destroy => sub {
3017 my ($ns) = @_; 3367 my ($ns) = @_;
3018 3368
3019 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3020 }, 3370 },
3021); 3371);
3037our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3038 3388
3039$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3040 3390
3041$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3043 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3044 sort time 3394 sort time
3045)); 3395));
3046 3396
3047# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3051The following functions and methods are available within a safe environment: 3401The following functions and methods are available within a safe environment:
3052 3402
3053 cf::object 3403 cf::object
3054 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
3055 insert remove name archname title slaying race decrease split 3405 insert remove name archname title slaying race decrease split
3406 value
3056 3407
3057 cf::object::player 3408 cf::object::player
3058 player 3409 player
3059 3410
3060 cf::player 3411 cf::player
3066=cut 3417=cut
3067 3418
3068for ( 3419for (
3069 ["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
3070 insert remove inv nrof name archname title slaying race 3421 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3424 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3075) { 3426) {
3076 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3079 for @funs; 3429 for @funs;
3080} 3430}
3081 3431
3096 3446
3097 my $qcode = $code; 3447 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3100 3450
3451 %vars = (_dummy => 0) unless %vars;
3452
3453 my @res;
3101 local $_; 3454 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars;
3103 3455
3104 my $eval = 3456 my $eval =
3105 "do {\n" 3457 "do {\n"
3106 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3107 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3108 . $code 3460 . $code
3109 . "\n}" 3461 . "\n}"
3110 ; 3462 ;
3111 3463
3464 if ($CFG{safe_eval}) {
3112 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3113 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3114 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 }
3115 3473
3116 if ($@) { 3474 if ($@) {
3117 warn "$@"; 3475 warn "$@",
3118 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3119 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3120 } 3478 }
3121 3479
3122 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3123} 3481}
3124 3482
3138=cut 3496=cut
3139 3497
3140sub register_script_function { 3498sub register_script_function {
3141 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3142 3500
3143 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3144 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3145} 3503}
3146 3504
3147=back 3505=back
3148 3506
3149=cut 3507=cut
3150 3508
3151############################################################################# 3509#############################################################################
3152# 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}
3153 3535
3154sub load_facedata($) { 3536sub load_facedata($) {
3155 my ($path) = @_; 3537 my ($path) = @_;
3156 3538
3157 # 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
3158 # for this (global event?) 3540 # for this (global event?)
3159 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3160 3542
3161 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3162 3544
3163 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3164 3546
3165 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3166 0 < aio_load $path, $facedata
3167 or die "$path: $!";
3168
3169 $facedata = Coro::Storable::thaw $facedata;
3170 3548
3171 $facedata->{version} == 2 3549 $facedata->{version} == 2
3172 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3173 3551
3174 # patch in the exptable
3175 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC,
3177 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3178 };
3179 cf::cede_to_tick; 3552 cf::cede_to_tick;
3180 3553
3181 { 3554 {
3182 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3183 3556
3184 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3185 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186 3560
3187 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3190 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#
3191 3567
3192 cf::cede_to_tick; 3568 cf::cede_to_tick;
3193 } 3569 }
3194 3570
3195 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
3200 3576
3201 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3202 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3204 } else { 3580 } else {
3205 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3206 } 3582 }
3207 3583
3208 cf::cede_to_tick; 3584 cf::cede_to_tick;
3209 } 3585 }
3210 } 3586 }
3219 3595
3220 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3221 } 3597 }
3222 3598
3223 { 3599 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3227 3601
3228 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3229 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
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232 3606
3233 if ($info->{type} & 1) {
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 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#
3248 } else { 3611 } else {
3249 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3250 } 3613 }
3251 3614
3252 cf::cede_to_tick; 3615 cf::cede_to_tick;
3253 } 3616 }
3254 } 3617 }
3255 3618
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257 3620
3258 1 3621 1
3259} 3622}
3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280 3623
3281register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3283 3626
3284 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
3292 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3294 cf::arch::commit_load; 3637 cf::arch::commit_load;
3295 3638
3296 $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;
3297} 3653}
3298 3654
3299sub reload_regions { 3655sub reload_regions {
3300 # 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
3301 # for this (global event?) 3657 # for this (global event?)
3316} 3672}
3317 3673
3318sub reload_archetypes { 3674sub reload_archetypes {
3319 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3320 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 );
3321} 3686}
3322 3687
3323sub reload_treasures { 3688sub reload_treasures {
3324 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3325 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3326} 3691}
3327 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
3328sub reload_resources { 3713sub reload_resources {
3329 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3330 3715
3716 reload_materials;
3331 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3332 reload_archetypes; 3720 reload_archetypes;
3333 reload_regions; 3721 reload_regions;
3334 reload_treasures; 3722 reload_treasures;
3335 3723
3336 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3337}
3338
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345} 3725}
3346 3726
3347sub reload_config { 3727sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3728 trace "reloading config file...\n";
3349 or return;
3350 3729
3351 local $/; 3730 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3353 3733
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3735
3356 $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};
3357 $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};
3358 3738
3359 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
3382 3762
3383 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3384 print $fh $$; 3764 print $fh $$;
3385} 3765}
3386 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
3387sub main { 3776sub main {
3388 atomic; 3777 cf::init_globals; # initialise logging
3778
3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3783
3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3785
3390 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3392 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#
3393 (async { 3789 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3397 }; 3793 };
3398 3794
3399 { 3795 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3796
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
3806 reload_resources;
3401 reload_config; 3807 reload_config;
3402 db_init; 3808 db_init;
3809
3810 cf::init_uuid;
3811 cf::init_signals;
3812 cf::init_skills;
3813
3814 cf::init_beforeplay;
3815
3816 atomic;
3817
3403 load_extensions; 3818 load_extensions;
3404 3819
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3820 utime time, time, $RUNTIMEFILE;
3409 3821
3410 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3823 use POSIX ();
3411 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};
3412 3825
3413 EV::loop; 3826 cf::_post_init 0;
3827 };
3828
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;
3414} 3837}
3415 3838
3416############################################################################# 3839#############################################################################
3417# initialisation and cleanup 3840# initialisation and cleanup
3418 3841
3419# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3420BEGIN { 3843BEGIN {
3421 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3422 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3423 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3424 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3425 }; 3848 };
3426 } 3849 }
3427} 3850}
3428 3851
3429sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3430 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3432 3857
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3859
3435 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3436 3861
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 3863 or return;
3439 3864
3440 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
3455 or return; 3880 or return;
3456 3881
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3883 and return;
3459 3884
3460 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 3886
3462 1 3887 1
3463} 3888}
3464 3889
3465our $uuid_lock; 3890our $uuid_lock;
3474 my $uuid = "$LOCALDIR/uuid"; 3899 my $uuid = "$LOCALDIR/uuid";
3475 3900
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3901 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3902 or return;
3478 3903
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3905
3906 unless ($value) {
3907 info "cowardly refusing to write zero uuid value!\n";
3908 return;
3909 }
3910
3911 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3912 $uuid_skip = 0;
3481 3913
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3914 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3915 and return;
3484 3916
3490 or return; 3922 or return;
3491 3923
3492 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3493 and return; 3925 and return;
3494 3926
3495 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3496 3928
3497 1 3929 1
3498 3930
3499} 3931}
3500 3932
3506} 3938}
3507 3939
3508sub emergency_save() { 3940sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3510 3942
3511 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;
3512 3949
3513 cf::sync_job { 3950 cf::sync_job {
3951 cf::write_runtime_sync; # external watchdog should not bark
3952
3514 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3959 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3961 $pl->save;
3523 } 3962 }
3524 warn "end emergency player save\n"; 3963 info "emergency_perl_save: end player save\n";
3525 3964
3526 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";
3527 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3970 $map->valid or next;
3530 $map->save; 3971 $map->save;
3531 } 3972 }
3532 warn "end emergency map save\n"; 3973 info "emergency_perl_save: end map save\n";
3533 3974
3534 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";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3537 3980
3538 warn "begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3982 write_uuid_sync 1;
3540 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
3541 }; 4003 };
3542 4004
3543 warn "leave emergency perl save\n"; 4005 info "emergency_perl_save: leave\n";
3544} 4006}
3545 4007
3546sub post_cleanup { 4008sub post_cleanup {
3547 my ($make_core) = @_; 4009 my ($make_core) = @_;
3548 4010
4011 IO::AIO::flush;
4012
3549 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 4014 if $make_core;
3551 4015
3552 my $fh = pidfile; 4016 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3554} 4018}
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 4042 }
3579 warn "cleared package #$pkg\n";#d#
3580} 4043}
3581
3582our $RELOAD; # how many times to reload
3583 4044
3584sub do_reload_perl() { 4045sub do_reload_perl() {
3585 # can/must only be called in main 4046 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3587 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3588 return; 4049 return;
3589 } 4050 }
3590 4051
3591 return if $RELOAD++; 4052 return if $RELOAD++;
3592 4053
4054 my $t1 = AE::time;
4055
3593 while ($RELOAD) { 4056 while ($RELOAD) {
3594 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3595 4059
3596 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3597 4061
3598 cf::sync_job { 4062 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 4063 #cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark
3602 4064
3603 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV;
3605
3606 # if anything goes wrong in here, we should simply crash as we already saved
3607
3608 warn "flushing outstanding aio requests";
3609 while (IO::AIO::nreqs || BDB::nreqs) {
3610 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3611 }
3612
3613 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3614 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3615 %EXT_CORO = (); 4067 %EXT_CORO = ();
3616 4068
3617 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3618 %COMMAND = (); 4070 %COMMAND = ();
3619 4071
3620 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3621 %EXTCMD = (); 4073 %EXTCMD = ();
3622 %EXTICMD = (); 4074 %EXTICMD = ();
3623 4075
3624 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3625 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3626 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3627 4079
3628 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3629 eval { 4081 eval {
3630 $cb->($pkg); 4082 $cb->($pkg);
3631 1 4083 1
3632 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3633 } 4085 }
3634 4086
3635 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3636 clear_package $pkg; 4088 clear_package $pkg;
3637 } 4089 }
3638 4090
3639 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642 4094
3643 warn "... unloading $k"; 4095 trace "... unloading $k";
3644 delete $INC{$k}; 4096 delete $INC{$k};
3645 4097
3646 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3648 4100
3651 } 4103 }
3652 4104
3653 clear_package $k; 4105 clear_package $k;
3654 } 4106 }
3655 4107
3656 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3657 clear_package "safe::$_" 4109 clear_package "safe::$_"
3658 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);
3659 4111
3660 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 4115
3664 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3665 # and global variables created in xs 4117 # and global variables created in xs
3666 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3667 4119
3668 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3669 4121
3670 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3671 require cf; 4123 require cf;
3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4124 cf::_connect_to_perl_1;
3673 4125
3674 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3675 cf::reload_config; 4127 cf::reload_config;
3676 4128
3677 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3678 cf::load_extensions; 4130 cf::load_extensions;
3679 4131
4132 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3683 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
4139 }
3686 4140
3687 warn "leaving sync_job"; 4141 cf::_post_init 1;
4142
4143 trace "perl_reload: leaving sync_job";
3688 4144
3689 1 4145 1
3690 } or do { 4146 } or do {
3691 warn $@; 4147 error $@;
3692 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3693 }; 4149 };
3694 4150
3695 warn "reloaded";
3696 --$RELOAD; 4151 --$RELOAD;
3697 } 4152 }
4153
4154 $t1 = AE::time - $t1;
4155 info "perl_reload: completed in ${t1}s\n";
3698}; 4156};
3699 4157
3700our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3701 4159
3702sub reload_perl() { 4160sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 4161 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3705 4163
4164 $RELOAD_WATCHER ||= cf::async {
4165 Coro::AIO::aio_wait cache_extensions;
4166
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 4168 do_reload_perl;
3708 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
4170 };
3709 }; 4171 };
3710} 4172}
3711 4173
3712register_command "reload" => sub { 4174register_command "reload" => sub {
3713 my ($who, $arg) = @_; 4175 my ($who, $arg) = @_;
3719 reload_perl; 4181 reload_perl;
3720 }; 4182 };
3721 } 4183 }
3722}; 4184};
3723 4185
3724unshift @INC, $LIBDIR; 4186#############################################################################
3725 4187
3726my $bug_warning = 0; 4188my $bug_warning = 0;
3727 4189
3728our @WAIT_FOR_TICK;
3729our @WAIT_FOR_TICK_BEGIN;
3730
3731sub wait_for_tick { 4190sub wait_for_tick() {
3732 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3733 4192
3734 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3735 push @WAIT_FOR_TICK, $signal;
3736 $signal->wait;
3737} 4194}
3738 4195
3739sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3741 4198
3742 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3744 $signal->wait; 4201 $signal->wait;
3745} 4202}
3749 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"
3750 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3751 return; 4208 return;
3752 } 4209 }
3753 4210
3754 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#
3755 4214
3756 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3757 $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.;
3758 Coro::async_pool { 4217 Coro::async_pool {
3759 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3760 write_runtime_sync 4219 write_runtime_sync
3761 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3762 }; 4221 };
3763 } 4222 }
3764 4223
3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3766 $sig->send; 4225 $sig->send;
3767 } 4226 }
3768 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3769 $sig->send;
3770 }
3771 4228
3772 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3773 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3774 4231
3775 if (0) { 4232 if (0) {
3776 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3777 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3780 } 4237 }
3781 } 4238 }
3782} 4239}
3783 4240
3784{ 4241{
3785 # configure BDB 4242 # configure BDB
3786 4243
3787 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3788 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3789 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3790 4247
3791 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3792 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3794 $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;
3829 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3831 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3832} 4289}
3833 4290
3834my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3835 4293
3836sub _log_backtrace { 4294sub _log_backtrace {
3837 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3838 4296
3839 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3840 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3841 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3843 ++$_log_backtrace; 4305 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3845 async { 4307 async {
3846 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
3847 4309
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4330 --$_log_backtrace;
3869 }; 4331 };
3870 } else { 4332 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3873 } 4335 }
3874} 4336}
3875 4337
3876# load additional modules 4338# load additional modules
3877use cf::pod; 4339require "cf/$_.pm" for @EXTRA_MODULES;
4340cf::_connect_to_perl_2;
3878 4341
3879END { cf::emergency_save } 4342END { cf::emergency_save }
3880 4343
38811 43441
3882 4345

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines