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.443 by root, Sun Aug 31 10:05:26 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
98 115
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 118our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
103 120
104our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 124our $DB_ENV;
108 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
109our %CFG; 128our %CFG;
110 129
111our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 131our $RUNTIME;
113our $NOW; 132our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 143our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
126 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
127binmode STDOUT; 151binmode STDOUT;
128binmode STDERR; 152binmode STDERR;
129 153
130# read virtual server time, if available 154# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
135} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
136 162
137mkdir $_ 163mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 165
140our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
141 167
142sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 184
144############################################################################# 185#############################################################################
145 186
146=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
147 188
194returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 237
197=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
198 239
199This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 242that call.
202 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
203=back 250=back
204 251
205=cut 252=cut
206 253
207BEGIN { 254$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 255 my $msg = join "", @_;
210 256
211 $msg .= "\n" 257 $msg .= "\n"
212 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
213 259
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 261
216 LOG llevError, $msg; 262 LOG llevError, $msg;
217 }; 263};
218}
219 264
220$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
222 267
223 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 272 return;#d#
226 }#d# 273 }#d#
227 274
228 # kill coroutine otherwise 275 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 276 Coro::terminate
231}; 277};
232
233$SIG{__DIE__} = sub { }; #d#?
234 278
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 296)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 298}
255 299
256$EV::DIED = sub { 300$EV::DIED = sub {
257 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
258}; 302};
259 303
260############################################################################# 304#############################################################################
261 305
262=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 344
301sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
303 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
304=item cf::lock_wait $string 362=item cf::lock_wait $string
305 363
306Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
307 365
308=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
309 367
310Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
313returned. 371returned.
314 372
315Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 374deadlocked coro.
322 380
323Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
324 382
325=cut 383=cut
326 384
327our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 386
330sub lock_wait($) { 387sub lock_wait($) {
331 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 389}
344 390
345sub lock_acquire($) { 391sub lock_acquire($) {
346 my ($key) = @_; 392 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 393}
360 394
361sub lock_active($) { 395sub lock_active($) {
362 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 397}
366 398
367sub freeze_mainloop { 399sub freeze_mainloop {
368 tick_inhibit_inc; 400 tick_inhibit_inc;
369 401
370 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
371} 403}
372 404
373=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
374 406
375Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 408get spread over time.
377 409
378=cut 410=cut
379 411
380sub periodic($$) { 412sub periodic($$) {
381 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
398 430
399=cut 431=cut
400 432
401our @SLOT_QUEUE; 433our @SLOT_QUEUE;
402our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
403 436
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
407 440
408 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
409 443
410 while () { 444 while () {
411 next_job: 445 next_job:
446
412 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 448
414 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 453 $job->[2]->send;
418 Coro::cede; 454 Coro::cede;
419 goto next_job; 455 goto next_job;
420 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 458 }
422 } 459 }
423 460
424 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 464 $signal->wait;
428 } else { 465 } else {
466 $busy = 0;
429 Coro::schedule; 467 Coro::schedule;
430 } 468 }
431 } 469 }
432}; 470};
433 471
434sub get_slot($;$$) { 472sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
436 474
437 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
438 476
439 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
440 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
441 480
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
471 510
472sub sync_job(&) { 511sub sync_job(&) {
473 my ($job) = @_; 512 my ($job) = @_;
474 513
475 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 515 my $time = AE::time;
477 516
478 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
480 519
481 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
498 } else { 537 } else {
499 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
500 } 539 }
501 } 540 }
502 541
503 my $time = EV::time - $time; 542 my $time = AE::time - $time;
504 543
505 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
506 545
507 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
508 } else { 547 } else {
552 reset_signals; 591 reset_signals;
553 &$cb 592 &$cb
554 }, @args; 593 }, @args;
555 594
556 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
557} 607}
558 608
559=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
560 610
561=cut 611=cut
727 777
728############################################################################# 778#############################################################################
729 779
730=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
731 781
732Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
735 785
736In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
788 838
789Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
791 841
792Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
794 844
795These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
796 846
797=over 4 847=over 4
1147 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1148 1198
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1153 aio_close $fh; 1206 aio_close $fh;
1154 1207
1155 if (@$objs) { 1208 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1161 aio_close $fh; 1217 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1219 }
1164 } else { 1220 } else {
1165 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1166 } 1222 }
1167 1223
1168 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1228 } else {
1170 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1171 } 1230 }
1172 } else { 1231 } else {
1173 aio_unlink $filename; 1232 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1175 } 1234 }
1266 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1267 1326
1268 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1269} 1328}
1270 1329
1330use File::Glob ();
1331
1271cf::player->attach ( 1332cf::player->attach (
1272 on_command => sub { 1333 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1274 1335
1275 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1276 or return; 1337 or return;
1277 1338
1307 1368
1308 cf::override; 1369 cf::override;
1309 }, 1370 },
1310); 1371);
1311 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1312sub load_extensions { 1386sub load_extensions {
1313 cf::sync_job { 1387 cf::sync_job {
1314 my %todo; 1388 my %todo;
1315 1389
1316 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1343 . "\n};\n1"; 1417 . "\n};\n1";
1344 1418
1345 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1346 } 1420 }
1347 1421
1422 my $pass = 0;
1348 my %done; 1423 my %done;
1349 while (%todo) { 1424 while (%todo) {
1350 my $progress; 1425 my $progress;
1351 1426
1427 ++$pass;
1428
1429 ext:
1352 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1432 next ext
1355 unless exists $done{$_}; 1433 unless exists $done{$_};
1356 } 1434 }
1357 1435
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1437
1360 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1442
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1444 if exists $v->{meta}{mandatory};
1368 1445
1369 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1370 } 1455 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1456 }
1376 1457
1377 skip: 1458 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1380 } 1466 }
1381 }; 1467 };
1382} 1468}
1383 1469
1384############################################################################# 1470#############################################################################
1385 1471
1386=back 1472=back
1387 1473
1388=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1389 1475
1390Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1391 1477
1392=cut 1478=cut
1393 1479
1394package cf::player; 1480package cf::player;
1395 1481
1438 1524
1439sub exists($) { 1525sub exists($) {
1440 my ($login) = @_; 1526 my ($login) = @_;
1441 1527
1442 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1444} 1530}
1445 1531
1446sub find($) { 1532sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1534 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1469 } 1555 }
1470 } 1556 }
1471} 1557}
1472 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1473sub save($) { 1572sub save($) {
1474 my ($pl) = @_; 1573 my ($pl) = @_;
1475 1574
1476 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1477 1576
1482 1581
1483 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1485 1584
1486 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1589
1488 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1591 cf::cede_to_tick;
1490} 1592}
1491 1593
1593 \@logins 1695 \@logins
1594} 1696}
1595 1697
1596=item $player->maps 1698=item $player->maps
1597 1699
1700=item cf::player::maps $login
1701
1598Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1599player. May block. 1703player. May block.
1600 1704
1601=cut 1705=cut
1602 1706
1619 } 1723 }
1620 1724
1621 \@paths 1725 \@paths
1622} 1726}
1623 1727
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1729
1626Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1731
1719=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1720 1733
1721Sends an ext reply to the player. 1734Sends an ext reply to the player.
1722 1735
1754 1767
1755=cut 1768=cut
1756 1769
1757sub find_by_path($) { 1770sub find_by_path($) {
1758 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1759 1774
1760 my ($match, $specificity); 1775 my ($match, $specificity);
1761 1776
1762 for my $region (list) { 1777 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796 1811
1797 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1813 $self->_create_random_map (
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1935 1950
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1938} 1953}
1939 1954
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1955sub decay_objects {
1950 my ($self) = @_; 1956 my ($self) = @_;
1951 1957
1952 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1953 1959
2035sub find { 2041sub find {
2036 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
2037 2043
2038 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
2039 2045
2040 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2048
2043 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
2048 or return; 2051 or return;
2049 2052
2050 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
2051 2054
2063 2066
2064 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2065 } 2068 }
2066} 2069}
2067 2070
2068sub pre_load { } 2071sub pre_load { }
2069sub post_load { } 2072#sub post_load { } # XS
2070 2073
2071sub load { 2074sub load {
2072 my ($self) = @_; 2075 my ($self) = @_;
2073 2076
2074 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2119 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2123 $self->decay_objects;
2121 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2122 $self->update_buttons; 2125 $self->update_buttons;
2123 cf::cede_to_tick; 2126 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2127 $self->activate;
2127 } 2128 }
2128 2129
2129 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2133 } 2134 }
2134 2135
2135 $self->post_load; 2136 $self->post_load;
2136} 2137}
2137 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2138sub customise_for { 2142sub customise_for {
2139 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2140 2144
2141 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2146 if $self->per_player;
2219 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2220 2224
2221 () 2225 ()
2222} 2226}
2223 2227
2228# common code, used by both ->save and ->swapout
2224sub save { 2229sub _save {
2225 my ($self) = @_; 2230 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2231
2229 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2230 2233
2231 return unless $self->dirty; 2234 return unless $self->dirty;
2232 2235
2252 } else { 2255 } else {
2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2254 } 2257 }
2255} 2258}
2256 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2257sub swap_out { 2268sub swap_out {
2258 my ($self) = @_; 2269 my ($self) = @_;
2259 2270
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2272
2265 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2267 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2268 2276
2269 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2270
2271 $self->deactivate; 2278 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2273 $self->clear; 2286 $self->clear;
2274} 2287}
2275 2288
2276sub reset_at { 2289sub reset_at {
2277 my ($self) = @_; 2290 my ($self) = @_;
2296 2309
2297 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298 2311
2299 return if $self->players; 2312 return if $self->players;
2300 2313
2301 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2302 2315
2303 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2304 2317
2305 # need to save uniques path 2318 # need to save uniques path
2306 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2397 : normalise $_ 2410 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2412 ]
2400} 2413}
2401 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2402=back 2447=back
2403 2448
2404=head3 cf::object 2449=head3 cf::object
2405 2450
2406=cut 2451=cut
2471 2516
2472our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2473 id => "say", 2518 id => "say",
2474 title => "Map", 2519 title => "Map",
2475 reply => "say ", 2520 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2522};
2478 2523
2479our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2480 id => "chat", 2525 id => "chat",
2481 title => "Chat", 2526 title => "Chat",
2536 2581
2537=item $player_object->enter_link 2582=item $player_object->enter_link
2538 2583
2539Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2540 2585
2541The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2543 2590
2544Will never block. 2591Will never block.
2545 2592
2546=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2547 2594
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2620
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2576 2623
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2625}
2579 2626
2580sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2582 2629
2599 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2601 2648
2602 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2605 2652
2606 $map->load; 2653 $map->load;
2607 $map->load_neighbours; 2654 $map->load_neighbours;
2608 2655
2609 return unless $self->contr->active; 2656 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2657
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2614} 2663}
2615 2664
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617 2666
2618Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2777 $self->contr->savebed ($map, $x, $y) 2826 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2827 if $exit->flag (cf::FLAG_DAMNED);
2779 2828
2780 1 2829 1
2781 }) { 2830 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2835
2787 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2804sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2806 2855
2807 utf8::encode $text; 2856 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2809} 2883}
2810 2884
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2886
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2817 2891
2818=cut 2892=cut
2819 2893
2820# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2822 "c/identify" => { 2902 "c/identify" => {
2823 id => "infobox", 2903 id => "infobox",
2824 title => "Identify", 2904 title => "Identify",
2825 reply => undef, 2905 reply => undef,
2826 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2828 "c/examine" => { 2908 "c/examine" => {
2829 id => "infobox", 2909 id => "infobox",
2830 title => "Examine", 2910 title => "Examine",
2831 reply => undef, 2911 reply => undef,
2832 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2919 },
2834 "c/book" => { 2920 "c/book" => {
2835 id => "infobox", 2921 id => "infobox",
2836 title => "Book", 2922 title => "Book",
2837 reply => undef, 2923 reply => undef,
2853 id => "infobox", 2939 id => "infobox",
2854 title => "Body Parts", 2940 title => "Body Parts",
2855 reply => undef, 2941 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2857 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2858 "c/uptime" => { 2980 "c/uptime" => {
2859 id => "infobox", 2981 id => "infobox",
2860 title => "Uptime", 2982 title => "Uptime",
2861 reply => undef, 2983 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2871 id => "party", 2993 id => "party",
2872 title => "Party", 2994 title => "Party",
2873 reply => "gsay ", 2995 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2875 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2876); 3006);
2877 3007
2878sub cf::client::send_msg { 3008sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3010
2881 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2882 3013
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3015
2885 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2888 3019
2889 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2893 3022
2894 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3028 }
2901 3029
2902 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2903 } 3031 }
2904 3032
2905 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2906 3034
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3035 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2911 3038
2912 my $pkt = "msg " 3039 my $pkt = "msg "
2913 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 ); 3042 );
2916 3043
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2928 } else {
2929 if ($color >= 0) {
2930 # replace some tags by gcfclient-compatible ones
2931 for ($msg) {
2932 1 while
2933 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2934 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2935 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2936 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2937 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2938 }
2939
2940 $color &= cf::NDI_COLOR_MASK;
2941
2942 utf8::encode $msg;
2943
2944 if (0 && $msg =~ /\[/) {
2945 # COMMAND/INFO
2946 $self->send_packet ("drawextinfo $color 10 8 $msg")
2947 } else {
2948 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2949 $self->send_packet ("drawinfo $color $msg")
2950 }
2951 }
2952 }
2953} 3045}
2954 3046
2955=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2956 3048
2957Sends an ext event to the client. 3049Sends an ext event to the client.
2960 3052
2961sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2962 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2963 3055
2964 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2966 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2967 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3061 }
2970} 3062}
2971 3063
2972=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2973 3065
2977 3069
2978sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2980 3072
2981 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove 3076 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2987 } 3079 }
2988} 3080}
2989 3081
2990=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2991 3083
3092 3184
3093 $coro 3185 $coro
3094} 3186}
3095 3187
3096cf::client->attach ( 3188cf::client->attach (
3097 on_destroy => sub { 3189 on_client_destroy => sub {
3098 my ($ns) = @_; 3190 my ($ns) = @_;
3099 3191
3100 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3101 }, 3193 },
3102); 3194);
3118our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3119 3211
3120$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3121 3213
3122$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3123 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3124 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3125 sort time 3217 sort time
3126)); 3218));
3127 3219
3128# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3132The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3133 3225
3134 cf::object 3226 cf::object
3135 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3136 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3137 3230
3138 cf::object::player 3231 cf::object::player
3139 player 3232 player
3140 3233
3141 cf::player 3234 cf::player
3147=cut 3240=cut
3148 3241
3149for ( 3242for (
3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3151 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3153 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3154 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3155 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3156) { 3249) {
3157 no strict 'refs'; 3250 no strict 'refs';
3158 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3159 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3177 3270
3178 my $qcode = $code; 3271 my $qcode = $code;
3179 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3180 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3181 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3182 local $_; 3278 local $_;
3183 local @safe::cf::_safe_eval_args = values %vars;
3184 3279
3185 my $eval = 3280 my $eval =
3186 "do {\n" 3281 "do {\n"
3187 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3188 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3189 . $code 3284 . $code
3190 . "\n}" 3285 . "\n}"
3191 ; 3286 ;
3192 3287
3288 if ($CFG{safe_eval}) {
3193 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3194 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3195 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3196 3297
3197 if ($@) { 3298 if ($@) {
3198 warn "$@"; 3299 warn "$@";
3199 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3200 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3219=cut 3320=cut
3220 3321
3221sub register_script_function { 3322sub register_script_function {
3222 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3223 3324
3224 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3225 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3226} 3327}
3227 3328
3228=back 3329=back
3229 3330
3230=cut 3331=cut
3251 3352
3252 $facedata->{version} == 2 3353 $facedata->{version} == 2
3253 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3254 3355
3255 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3256 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3257 type => FT_RSRC, 3359 type => FT_RSRC,
3258 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3259 }; 3362 };
3260 cf::cede_to_tick; 3363 cf::cede_to_tick;
3261 3364
3262 { 3365 {
3263 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3265 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3266 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267 3370
3268 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3269 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3272 3375
3273 cf::cede_to_tick; 3376 cf::cede_to_tick;
3274 } 3377 }
3275 3378
3276 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3300 3403
3301 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3302 } 3405 }
3303 3406
3304 { 3407 {
3305 # TODO: for gcfclient pleasure, we should give resources
3306 # that gcfclient doesn't grok a >10000 face index.
3307 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3308 3409
3309 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3311 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
3313 3413
3314 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3315 # prepend meta info
3316
3317 my $meta = $enc->encode ({
3318 name => $name,
3319 %{ $info->{meta} || {} },
3320 });
3321
3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3329 } else { 3416 } else {
3330 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3331 } 3418 }
3332 3419
3415 reload_treasures; 3502 reload_treasures;
3416 3503
3417 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3418} 3505}
3419 3506
3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 reload_resources;
3426}
3427
3428sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3429 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3430 or return; 3511 or return;
3431 3512
3432 local $/; 3513 local $/;
3433 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3434 3515
3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3436 3517
3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3442 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3443 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3444 }; 3525 };
3445 warn $@ if $@; 3526 warn $@ if $@;
3446 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3447} 3558}
3448 3559
3449sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3450 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3573 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3457 }; 3577 };
3458 3578
3459 { 3579 evthread_start IO::AIO::poll_fileno;
3460 my $guard = freeze_mainloop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3461 reload_config; 3591 reload_config;
3462 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3463 load_extensions; 3602 load_extensions;
3464 3603
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3604 utime time, time, $RUNTIMEFILE;
3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3466 } 3611 };
3467 3612
3468 EV::loop; 3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3469} 3617}
3470 3618
3471############################################################################# 3619#############################################################################
3472# initialisation and cleanup 3620# initialisation and cleanup
3473 3621
3474# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3475BEGIN { 3623BEGIN {
3476 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3477 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3478 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3479 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3480 }; 3628 };
3481 } 3629 }
3482} 3630}
3483 3631
3484sub write_runtime_sync { 3632sub write_runtime_sync {
3485 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3486 3634
3487 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3489 3637
3490 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3639
3492 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3493 3641
3494 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3643 or return;
3496 3644
3497 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3509 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3510 3658
3511 close $fh 3659 close $fh
3512 or return; 3660 or return;
3513 3661
3514 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3663 and return;
3516 3664
3517 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3666
3519 1 3667 1
3520} 3668}
3521 3669
3522our $uuid_lock; 3670our $uuid_lock;
3531 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3532 3680
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return; 3682 or return;
3535 3683
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3537 $uuid_skip = 0; 3692 $uuid_skip = 0;
3538 3693
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return; 3695 and return;
3541 3696
3563} 3718}
3564 3719
3565sub emergency_save() { 3720sub emergency_save() {
3566 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3567 3722
3568 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3569 3724
3570 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3571 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3572 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3573 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3574 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3575 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3576 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3577 $pl->valid or next; 3737 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3579 $pl->save; 3739 $pl->save;
3580 } 3740 }
3581 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3582 3742
3583 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3584 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3585 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3586 $map->valid or next; 3746 $map->valid or next;
3587 $map->save; 3747 $map->save;
3588 } 3748 }
3589 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3590 3750
3591 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3592 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3593 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3594 3754
3595 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3596 write_uuid_sync 1; 3756 write_uuid_sync 1;
3597 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3598 }; 3758 };
3599 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3600 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3601} 3766}
3602 3767
3603sub post_cleanup { 3768sub post_cleanup {
3604 my ($make_core) = @_; 3769 my ($make_core) = @_;
3605 3770
3606 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3607 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3608} 3776}
3609 3777
3610# a safer delete_package, copied from Symbol 3778# a safer delete_package, copied from Symbol
3611sub clear_package($) { 3779sub clear_package($) {
3612 my $pkg = shift; 3780 my $pkg = shift;
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 } 3800 }
3633 warn "cleared package #$pkg\n";#d#
3634} 3801}
3635
3636our $RELOAD; # how many times to reload
3637 3802
3638sub do_reload_perl() { 3803sub do_reload_perl() {
3639 # can/must only be called in main 3804 # can/must only be called in main
3640 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3641 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3642 return; 3807 return;
3643 } 3808 }
3644 3809
3645 return if $RELOAD++; 3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3646 3813
3647 while ($RELOAD) { 3814 while ($RELOAD) {
3648 warn "reloading..."; 3815 warn "reloading...";
3649 3816
3650 warn "entering sync_job"; 3817 warn "entering sync_job";
3711 clear_package "safe::$_" 3878 clear_package "safe::$_"
3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3713 3880
3714 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3715 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3716 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3717 3884
3718 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3719 # and global variables created in xs 3886 # and global variables created in xs
3720 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3721 3888
3722 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3723 3890
3724 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3725 require cf; 3892 require cf;
3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3727 3894
3728 warn "loading config and database again"; 3895 warn "loading config and database again";
3729 cf::reload_config; 3896 cf::reload_config;
3730 3897
3731 warn "loading extensions"; 3898 warn "loading extensions";
3732 cf::load_extensions; 3899 cf::load_extensions;
3733 3900
3901 if ($REATTACH_ON_RELOAD) {
3734 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3735 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3736 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3737 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3738 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3739 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3740 3912
3741 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3742 3914
3743 1 3915 1
3744 } or do { 3916 } or do {
3747 }; 3919 };
3748 3920
3749 warn "reloaded"; 3921 warn "reloaded";
3750 --$RELOAD; 3922 --$RELOAD;
3751 } 3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3752}; 3927};
3753 3928
3754our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3755 3930
3756sub reload_perl() { 3931sub reload_perl() {
3757 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3758 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3759 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3939 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3763 }; 3942 };
3764} 3943}
3765 3944
3766register_command "reload" => sub { 3945register_command "reload" => sub {
3767 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3781 3960
3782our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3783our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3784 3963
3785sub wait_for_tick { 3964sub wait_for_tick {
3786 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3787 3966
3788 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3789 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3790 $signal->wait; 3969 $signal->wait;
3791} 3970}
3792 3971
3793sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3794 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3795 3974
3796 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3797 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3798 $signal->wait; 3977 $signal->wait;
3799} 3978}
3804 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3805 return; 3984 return;
3806 } 3985 }
3807 3986
3808 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3809 3990
3810 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3812 Coro::async_pool { 3993 Coro::async_pool {
3813 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3836} 4017}
3837 4018
3838{ 4019{
3839 # configure BDB 4020 # configure BDB
3840 4021
3841 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3842 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3843 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3844 4025
3845 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3846 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3893 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3894 4075
3895 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3896 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3897 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3898 async { 4080 async {
3899 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3900 4082
3901 my @bt = fork_call { 4083 my @bt = fork_call {
3902 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3913 } 4095 }
3914 4096
3915 @funcs 4097 @funcs
3916 }; 4098 };
3917 4099
3918 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3919 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3920 --$_log_backtrace; 4103 --$_log_backtrace;
3921 }; 4104 };
3922 } else { 4105 } else {
3923 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3924 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3925 } 4108 }
3926} 4109}
3927 4110
3928# load additional modules 4111# load additional modules
3929use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3930 4114
3931END { cf::emergency_save } 4115END { cf::emergency_save }
3932 4116
39331 41171
3934 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines