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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 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 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# <http://www.gnu.org/licenses/>.
18# 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 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE;
101 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
197returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 240
200=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
201 242
202This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 245that call.
205 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
206=back 253=back
207 254
208=cut 255=cut
209 256
210BEGIN { 257$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 258 my $msg = join "", @_;
213 259
214 $msg .= "\n" 260 $msg .= "\n"
215 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
216 262
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 264
219 LOG llevError, $msg; 265 LOG llevError, $msg;
220 }; 266};
221}
222 267
223$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
225 270
226 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 275 return;#d#
229 }#d# 276 }#d#
230 277
231 # kill coroutine otherwise 278 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 279 Coro::terminate
234}; 280};
235
236$SIG{__DIE__} = sub { }; #d#?
237 281
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 299)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 301}
258 302
259$EV::DIED = sub { 303$EV::DIED = sub {
260 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
261}; 305};
262 306
263############################################################################# 307#############################################################################
264 308
265=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 347
304sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
306 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
307=item cf::lock_wait $string 365=item cf::lock_wait $string
308 366
309Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
310 368
311=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
312 370
313Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
316returned. 374returned.
317 375
318Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 377deadlocked coro.
325 383
326Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
327 385
328=cut 386=cut
329 387
330our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 389
333sub lock_wait($) { 390sub lock_wait($) {
334 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 392}
347 393
348sub lock_acquire($) { 394sub lock_acquire($) {
349 my ($key) = @_; 395 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 396}
363 397
364sub lock_active($) { 398sub lock_active($) {
365 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 400}
369 401
370sub freeze_mainloop { 402sub freeze_mainloop {
371 tick_inhibit_inc; 403 tick_inhibit_inc;
372 404
373 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
374} 406}
375 407
376=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
377 409
378Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 411get spread over time.
380 412
381=cut 413=cut
382 414
383sub periodic($$) { 415sub periodic($$) {
384 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
401 433
402=cut 434=cut
403 435
404our @SLOT_QUEUE; 436our @SLOT_QUEUE;
405our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
406 439
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
410 443
411 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
412 446
413 while () { 447 while () {
414 next_job: 448 next_job:
449
415 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 451
417 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 456 $job->[2]->send;
421 Coro::cede; 457 Coro::cede;
422 goto next_job; 458 goto next_job;
423 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 461 }
425 } 462 }
426 463
427 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 467 $signal->wait;
431 } else { 468 } else {
469 $busy = 0;
432 Coro::schedule; 470 Coro::schedule;
433 } 471 }
434 } 472 }
435}; 473};
436 474
437sub get_slot($;$$) { 475sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
439 477
440 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
441 479
442 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
443 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
444 483
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
474 513
475sub sync_job(&) { 514sub sync_job(&) {
476 my ($job) = @_; 515 my ($job) = @_;
477 516
478 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 518 my $time = AE::time;
480 519
481 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
483 522
484 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 540 } else {
502 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
503 } 542 }
504 } 543 }
505 544
506 my $time = EV::time - $time; 545 my $time = AE::time - $time;
507 546
508 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
509 548
510 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
511 } else { 550 } else {
555 reset_signals; 594 reset_signals;
556 &$cb 595 &$cb
557 }, @args; 596 }, @args;
558 597
559 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
560} 610}
561 611
562=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
563 613
564=cut 614=cut
1145 1195
1146 sync_job { 1196 sync_job {
1147 if (length $$rdata) { 1197 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1151 1202
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1156 aio_close $fh; 1210 aio_close $fh;
1157 1211
1158 if (@$objs) { 1212 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1164 aio_close $fh; 1221 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1223 }
1167 } else { 1224 } else {
1168 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1169 } 1226 }
1170 1227
1171 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1232 } else {
1173 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1174 } 1234 }
1175 } else { 1235 } else {
1176 aio_unlink $filename; 1236 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1178 } 1238 }
1203 $av = $st->{objs}; 1263 $av = $st->{objs};
1204 } 1264 }
1205 1265
1206 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1209 1270
1210 ($data, $av) 1271 ($data, $av)
1211} 1272}
1212 1273
1213=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1270 1331
1271 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1272} 1333}
1273 1334
1335use File::Glob ();
1336
1274cf::player->attach ( 1337cf::player->attach (
1275 on_command => sub { 1338 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1277 1340
1278 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1279 or return; 1342 or return;
1280 1343
1310 1373
1311 cf::override; 1374 cf::override;
1312 }, 1375 },
1313); 1376);
1314 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1315sub load_extensions { 1391sub load_extensions {
1316 cf::sync_job { 1392 cf::sync_job {
1317 my %todo; 1393 my %todo;
1318 1394
1319 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1422 . "\n};\n1";
1347 1423
1348 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1349 } 1425 }
1350 1426
1427 my $pass = 0;
1351 my %done; 1428 my %done;
1352 while (%todo) { 1429 while (%todo) {
1353 my $progress; 1430 my $progress;
1354 1431
1432 ++$pass;
1433
1434 ext:
1355 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1437 next ext
1358 unless exists $done{$_}; 1438 unless exists $done{$_};
1359 } 1439 }
1360 1440
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1442
1363 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1447
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1449 if exists $v->{meta}{mandatory};
1371 1450
1372 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1373 } 1460 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1461 }
1379 1462
1380 skip: 1463 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1383 } 1471 }
1384 }; 1472 };
1385} 1473}
1386 1474
1387############################################################################# 1475#############################################################################
1441 1529
1442sub exists($) { 1530sub exists($) {
1443 my ($login) = @_; 1531 my ($login) = @_;
1444 1532
1445 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1447} 1535}
1448 1536
1449sub find($) { 1537sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1539 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1472 } 1560 }
1473 } 1561 }
1474} 1562}
1475 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1476sub save($) { 1577sub save($) {
1477 my ($pl) = @_; 1578 my ($pl) = @_;
1478 1579
1479 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1480 1581
1485 1586
1486 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1488 1589
1489 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1594
1491 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1596 cf::cede_to_tick;
1493} 1597}
1494 1598
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1636
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1534 $pl->deactivate; 1638 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1538 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1539 1642
1540 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1596 \@logins 1699 \@logins
1597} 1700}
1598 1701
1599=item $player->maps 1702=item $player->maps
1600 1703
1704=item cf::player::maps $login
1705
1601Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1602player. May block. 1707player. May block.
1603 1708
1604=cut 1709=cut
1605 1710
1667=cut 1772=cut
1668 1773
1669sub find_by_path($) { 1774sub find_by_path($) {
1670 my ($path) = @_; 1775 my ($path) = @_;
1671 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1672 my ($match, $specificity); 1779 my ($match, $specificity);
1673 1780
1674 for my $region (list) { 1781 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1815
1709 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1817 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1739 1846
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1848}
1742 1849
1743# also paths starting with '/' 1850# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1852
1746sub thawer_merge { 1853sub thawer_merge {
1747 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1748 1855
1749 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1847 1954
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1850} 1957}
1851 1958
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1959sub decay_objects {
1862 my ($self) = @_; 1960 my ($self) = @_;
1863 1961
1864 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1865 1963
1947sub find { 2045sub find {
1948 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1949 2047
1950 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1951 2049
1952 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2052
1955 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1960 or return; 2055 or return;
1961 2056
1962 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1963 2058
1975 2070
1976 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1977 } 2072 }
1978} 2073}
1979 2074
1980sub pre_load { } 2075sub pre_load { }
1981sub post_load { } 2076#sub post_load { } # XS
1982 2077
1983sub load { 2078sub load {
1984 my ($self) = @_; 2079 my ($self) = @_;
1985 2080
1986 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2127 $self->decay_objects;
2033 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2034 $self->update_buttons; 2129 $self->update_buttons;
2035 cf::cede_to_tick; 2130 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2131 $self->activate;
2039 } 2132 }
2040 2133
2041 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2045 } 2138 }
2046 2139
2047 $self->post_load; 2140 $self->post_load;
2048} 2141}
2049 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2050sub customise_for { 2146sub customise_for {
2051 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2052 2148
2053 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2150 if $self->per_player;
2070 or next; 2166 or next;
2071 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2072 or next; 2168 or next;
2073 $neigh->load; 2169 $neigh->load;
2074 2170
2171 # now find the diagonal neighbours
2075 push @neigh, 2172 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2175 }
2079 2176
2131 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2132 2229
2133 () 2230 ()
2134} 2231}
2135 2232
2233# common code, used by both ->save and ->swapout
2136sub save { 2234sub _save {
2137 my ($self) = @_; 2235 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2236
2141 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2142 2238
2143 return unless $self->dirty; 2239 return unless $self->dirty;
2144 2240
2164 } else { 2260 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2262 }
2167} 2263}
2168 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2169sub swap_out { 2273sub swap_out {
2170 my ($self) = @_; 2274 my ($self) = @_;
2171 2275
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2277
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2180 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2182 2332
2183 $self->deactivate; 2333 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2335 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2336
2231 $self->unlink_save; 2337 $self->unlink_save;
2232 $self->destroy; 2338 $self->destroy;
2233} 2339}
2234 2340
2242 2348
2243 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2244 2350
2245 $self->unlink_save; 2351 $self->unlink_save;
2246 2352
2247 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2358
2309 : normalise $_ 2415 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2417 ]
2312} 2418}
2313 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2314=back 2452=back
2315 2453
2316=head3 cf::object 2454=head3 cf::object
2317 2455
2318=cut 2456=cut
2383 2521
2384our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2385 id => "say", 2523 id => "say",
2386 title => "Map", 2524 title => "Map",
2387 reply => "say ", 2525 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2527};
2390 2528
2391our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2392 id => "chat", 2530 id => "chat",
2393 title => "Chat", 2531 title => "Chat",
2450 2588
2451Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2452 2590
2453The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2456map. 2594map.
2457 2595
2458Will never block. 2596Will never block.
2459 2597
2460=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2482 my ($self) = @_; 2620 my ($self) = @_;
2483 2621
2484 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2485 2623
2624 ++$self->{_link_recursion};
2625
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2627
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2490 2630
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2632}
2493 2633
2494sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2496 2636
2513 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2515 2655
2516 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2519 2659
2520 $map->load; 2660 $map->load;
2521 $map->load_neighbours; 2661 $map->load_neighbours;
2522 2662
2523 return unless $self->contr->active; 2663 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2664
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2529} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2530 2672
2673}
2674
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2676
2533Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2543 2687
2544our $GOTOGEN; 2688our $GOTOGEN;
2545 2689
2546sub cf::object::player::goto { 2690sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2548 2698
2549 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2701
2552 $self->enter_link; 2702 $self->enter_link;
2576 my $map = eval { 2726 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2578 2728
2579 if ($map) { 2729 if ($map) {
2580 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2732 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2734 }
2585 2735
2586 $map 2736 $map
2594 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2597 } 2747 }
2598 2748
2599 $done->() if $done; 2749 $done->($self) if $done;
2600 })->prio (1); 2750 })->prio (1);
2601} 2751}
2602 2752
2603=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2604 2754
2721 2871
2722 utf8::encode $text; 2872 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2724} 2874}
2725 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2902
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2729client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2730the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2732 2907
2733=cut 2908=cut
2734 2909
2735# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2737 "c/identify" => { 2918 "c/identify" => {
2738 id => "infobox", 2919 id => "infobox",
2739 title => "Identify", 2920 title => "Identify",
2740 reply => undef, 2921 reply => undef,
2741 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2743 "c/examine" => { 2924 "c/examine" => {
2744 id => "infobox", 2925 id => "infobox",
2745 title => "Examine", 2926 title => "Examine",
2746 reply => undef, 2927 reply => undef,
2747 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2935 },
2749 "c/book" => { 2936 "c/book" => {
2750 id => "infobox", 2937 id => "infobox",
2751 title => "Book", 2938 title => "Book",
2752 reply => undef, 2939 reply => undef,
2768 id => "infobox", 2955 id => "infobox",
2769 title => "Body Parts", 2956 title => "Body Parts",
2770 reply => undef, 2957 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2772 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2773 "c/uptime" => { 2996 "c/uptime" => {
2774 id => "infobox", 2997 id => "infobox",
2775 title => "Uptime", 2998 title => "Uptime",
2776 reply => undef, 2999 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3009 id => "party",
2787 title => "Party", 3010 title => "Party",
2788 reply => "gsay ", 3011 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2790 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2791); 3022);
2792 3023
2793sub cf::client::send_msg { 3024sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3026
2800 3031
2801 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2804 3035
2805 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2809 3038
2810 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3044 }
2817 3045
2818 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2819 } 3047 }
2820 3048
2821 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2822 3050
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3051 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2827 3054
2828 my $pkt = "msg " 3055 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3058 );
2832 3059
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3061}
2870 3062
2871=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2872 3064
2873Sends an ext event to the client. 3065Sends an ext event to the client.
2876 3068
2877sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2879 3071
2880 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3077 }
2886} 3078}
2887 3079
2888=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2889 3081
2893 3085
2894sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2896 3088
2897 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3092 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3095 }
2904} 3096}
2905 3097
2906=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2907 3099
3008 3200
3009 $coro 3201 $coro
3010} 3202}
3011 3203
3012cf::client->attach ( 3204cf::client->attach (
3013 on_destroy => sub { 3205 on_client_destroy => sub {
3014 my ($ns) = @_; 3206 my ($ns) = @_;
3015 3207
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3209 },
3018); 3210);
3034our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3035 3227
3036$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3037 3229
3038$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3041 sort time 3233 sort time
3042)); 3234));
3043 3235
3044# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3049 3241
3050 cf::object 3242 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3053 3246
3054 cf::object::player 3247 cf::object::player
3055 player 3248 player
3056 3249
3057 cf::player 3250 cf::player
3063=cut 3256=cut
3064 3257
3065for ( 3258for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3072) { 3265) {
3073 no strict 'refs'; 3266 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3093 3286
3094 my $qcode = $code; 3287 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3097 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3098 local $_; 3294 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3295
3101 my $eval = 3296 my $eval =
3102 "do {\n" 3297 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3300 . $code
3106 . "\n}" 3301 . "\n}"
3107 ; 3302 ;
3108 3303
3304 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3112 3313
3113 if ($@) { 3314 if ($@) {
3114 warn "$@"; 3315 warn "$@";
3115 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3135=cut 3336=cut
3136 3337
3137sub register_script_function { 3338sub register_script_function {
3138 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3139 3340
3140 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3142} 3343}
3143 3344
3144=back 3345=back
3145 3346
3146=cut 3347=cut
3167 3368
3168 $facedata->{version} == 2 3369 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3371
3171 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3375 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3378 };
3176 cf::cede_to_tick; 3379 cf::cede_to_tick;
3177 3380
3178 { 3381 {
3179 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3386
3184 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188 3391
3189 cf::cede_to_tick; 3392 cf::cede_to_tick;
3190 } 3393 }
3191 3394
3192 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3216 3419
3217 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3218 } 3421 }
3219 3422
3220 { 3423 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3224 3425
3225 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3429
3230 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3245 } else { 3432 } else {
3246 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3247 } 3434 }
3248 3435
3331 reload_treasures; 3518 reload_treasures;
3332 3519
3333 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3334} 3521}
3335 3522
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342}
3343
3344sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3346 or return; 3527 or return;
3347 3528
3348 local $/; 3529 local $/;
3349 *CFG = YAML::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3350 3531
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3533
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3536
3356 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
3358 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3360 }; 3541 };
3361 warn $@ if $@; 3542 warn $@ if $@;
3362 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3363} 3546}
3364 3547
3365sub pidfile() { 3548sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!"; 3550 or die "$PIDFILE: $!";
3379 3562
3380 seek $fh, 0, 0; 3563 seek $fh, 0, 0;
3381 print $fh $$; 3564 print $fh $$;
3382} 3565}
3383 3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3574}
3575
3384sub main { 3576sub main {
3385 atomic; 3577 cf::init_globals; # initialise logging
3578
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3585
3387 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3589 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3590 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3591 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3592 })->prio (Coro::PRIO_MAX);
3394 }; 3593 };
3395 3594
3396 { 3595 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3596
3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3606 reload_resources;
3398 reload_config; 3607 reload_config;
3399 db_init; 3608 db_init;
3609
3610 cf::init_uuid;
3611 cf::init_signals;
3612 cf::init_skills;
3613
3614 cf::init_beforeplay;
3615
3616 atomic;
3617
3400 load_extensions; 3618 load_extensions;
3401 3619
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3620 utime time, time, $RUNTIMEFILE;
3406 3621
3407 # no (long-running) fork's whatsoever before this point(!) 3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3625
3410 EV::loop; 3626 (pop @POST_INIT)->(0) while @POST_INIT;
3627 };
3628
3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3411} 3633}
3412 3634
3413############################################################################# 3635#############################################################################
3414# initialisation and cleanup 3636# initialisation and cleanup
3415 3637
3416# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3417BEGIN { 3639BEGIN {
3418 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3422 }; 3644 };
3423 } 3645 }
3424} 3646}
3425 3647
3426sub write_runtime_sync { 3648sub write_runtime_sync {
3649 my $t0 = AE::time;
3650
3427 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3429 3653
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3655
3432 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3433 3657
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3659 or return;
3436 3660
3437 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
3452 or return; 3676 or return;
3453 3677
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3679 and return;
3456 3680
3457 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3682
3459 1 3683 1
3460} 3684}
3461 3685
3462our $uuid_lock; 3686our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3695 my $uuid = "$LOCALDIR/uuid";
3472 3696
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3697 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3698 or return;
3475 3699
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3700 my $value = uuid_seq uuid_cur;
3701
3702 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n";
3704 return;
3705 }
3706
3707 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3708 $uuid_skip = 0;
3478 3709
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3710 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3711 and return;
3481 3712
3503} 3734}
3504 3735
3505sub emergency_save() { 3736sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3737 my $freeze_guard = cf::freeze_mainloop;
3507 3738
3508 warn "enter emergency perl save\n"; 3739 warn "emergency_perl_save: enter\n";
3509 3740
3510 cf::sync_job { 3741 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746
3511 # use a peculiar iteration method to avoid tripping on perl 3747 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3748 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3749 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3750 warn "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3751 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3752 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3753 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3755 $pl->save;
3520 } 3756 }
3521 warn "end emergency player save\n"; 3757 warn "emergency_perl_save: end player save\n";
3522 3758
3523 warn "begin emergency map save\n"; 3759 warn "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3760 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3761 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3762 $map->valid or next;
3527 $map->save; 3763 $map->save;
3528 } 3764 }
3529 warn "end emergency map save\n"; 3765 warn "emergency_perl_save: end map save\n";
3530 3766
3531 warn "begin emergency database checkpoint\n"; 3767 warn "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3768 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3769 warn "emergency_perl_save: end database checkpoint\n";
3534 3770
3535 warn "begin write uuid\n"; 3771 warn "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3772 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3773 warn "emergency_perl_save: end write uuid\n";
3538 }; 3774 };
3539 3775
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3540 warn "leave emergency perl save\n"; 3781 warn "emergency_perl_save: leave\n";
3541} 3782}
3542 3783
3543sub post_cleanup { 3784sub post_cleanup {
3544 my ($make_core) = @_; 3785 my ($make_core) = @_;
3545 3786
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3813 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3814 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3816 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3817}
3578
3579our $RELOAD; # how many times to reload
3580 3818
3581sub do_reload_perl() { 3819sub do_reload_perl() {
3582 # can/must only be called in main 3820 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3584 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3585 return; 3823 return;
3586 } 3824 }
3587 3825
3588 return if $RELOAD++; 3826 return if $RELOAD++;
3827
3828 my $t1 = AE::time;
3589 3829
3590 while ($RELOAD) { 3830 while ($RELOAD) {
3591 warn "reloading..."; 3831 warn "reloading...";
3592 3832
3593 warn "entering sync_job"; 3833 warn "entering sync_job";
3654 clear_package "safe::$_" 3894 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3896
3657 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3900
3661 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3902 # and global variables created in xs
3663 #clear_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3664 3904
3665 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3666 3906
3667 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3668 require cf; 3908 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3670 3910
3671 warn "loading config and database again"; 3911 warn "loading config and database again";
3672 cf::reload_config; 3912 cf::reload_config;
3673 3913
3674 warn "loading extensions"; 3914 warn "loading extensions";
3675 cf::load_extensions; 3915 cf::load_extensions;
3676 3916
3917 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3918 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3919 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3920 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3921 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3922 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3923 reattach $_ for values %PLAYER;
3924 }
3925
3926 warn "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3683 3928
3684 warn "leaving sync_job"; 3929 warn "leaving sync_job";
3685 3930
3686 1 3931 1
3687 } or do { 3932 } or do {
3690 }; 3935 };
3691 3936
3692 warn "reloaded"; 3937 warn "reloaded";
3693 --$RELOAD; 3938 --$RELOAD;
3694 } 3939 }
3940
3941 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n";
3695}; 3943};
3696 3944
3697our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3698 3946
3699sub reload_perl() { 3947sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 3948 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3702 3950
3951 $RELOAD_WATCHER ||= cf::async {
3952 Coro::AIO::aio_wait cache_extensions;
3953
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 3955 do_reload_perl;
3705 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3957 };
3706 }; 3958 };
3707} 3959}
3708 3960
3709register_command "reload" => sub { 3961register_command "reload" => sub {
3710 my ($who, $arg) = @_; 3962 my ($who, $arg) = @_;
3724 3976
3725our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3727 3979
3728sub wait_for_tick { 3980sub wait_for_tick {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 3982
3731 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 3985 $signal->wait;
3734} 3986}
3735 3987
3736sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3990
3739 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 3993 $signal->wait;
3742} 3994}
3747 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3748 return; 4000 return;
3749 } 4001 }
3750 4002
3751 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
4004
4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 4006
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4009 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
3779} 4033}
3780 4034
3781{ 4035{
3782 # configure BDB 4036 # configure BDB
3783 4037
3784 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3787 4041
3788 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3870 } 4124 }
3871} 4125}
3872 4126
3873# load additional modules 4127# load additional modules
3874use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3875 4130
3876END { cf::emergency_save } 4131END { cf::emergency_save }
3877 4132
38781 41331
3879 4134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines