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.433 by root, Sat May 10 22:38:52 2008 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
96 112
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 115our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
101 117
102our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 121our $DB_ENV;
106 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
107our %CFG; 125our %CFG;
108 126
109our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 128our $RUNTIME;
111our $NOW; 129our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 140our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
124 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
125binmode STDOUT; 148binmode STDOUT;
126binmode STDERR; 149binmode STDERR;
127 150
128# read virtual server time, if available 151# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
133} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
134 159
135mkdir $_ 160mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 162
138our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
139 164
140sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 177
142############################################################################# 178#############################################################################
143 179
144=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
145 181
192returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 230
195=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
196 232
197This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 235that call.
200 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
201=back 243=back
202 244
203=cut 245=cut
204 246
205BEGIN { 247$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 248 my $msg = join "", @_;
208 249
209 $msg .= "\n" 250 $msg .= "\n"
210 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
211 252
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 254
214 LOG llevError, $msg; 255 LOG llevError, $msg;
215 }; 256};
216}
217 257
218$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
220 262
221 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 265 return;#d#
224 }#d# 266 }#d#
225 267
226 # kill coroutine otherwise 268 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 269 Coro::terminate
229}; 270};
230
231$SIG{__DIE__} = sub { }; #d#?
232 271
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 282for my $pkg (qw(
244 cf::global cf::attachable 283 cf::global cf::attachable
245 cf::object cf::object::player 284 cf::object cf::object::player
246 cf::client cf::player 285 cf::client cf::player
247 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
248 cf::map cf::party cf::region 288 cf::party cf::region
249)) { 289)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 291}
253 292
254$EV::DIED = sub { 293$EV::DIED = sub {
255 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
256}; 295};
257 296
258############################################################################# 297#############################################################################
259 298
260=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 337
299sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
301 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
302=item cf::lock_wait $string 355=item cf::lock_wait $string
303 356
304Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
305 358
306=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
307 360
308Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
311returned. 364returned.
312 365
313Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 367deadlocked coro.
320 373
321Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
322 375
323=cut 376=cut
324 377
325our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 379
328sub lock_wait($) { 380sub lock_wait($) {
329 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 382}
342 383
343sub lock_acquire($) { 384sub lock_acquire($) {
344 my ($key) = @_; 385 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 386}
358 387
359sub lock_active($) { 388sub lock_active($) {
360 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 390}
364 391
365sub freeze_mainloop { 392sub freeze_mainloop {
366 tick_inhibit_inc; 393 tick_inhibit_inc;
367 394
368 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
369} 396}
370 397
371=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
372 399
373Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
396 423
397=cut 424=cut
398 425
399our @SLOT_QUEUE; 426our @SLOT_QUEUE;
400our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
401 429
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
405 433
406 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
407 436
408 while () { 437 while () {
409 next_job: 438 next_job:
439
410 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 441
412 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 446 $job->[2]->send;
416 Coro::cede; 447 Coro::cede;
417 goto next_job; 448 goto next_job;
418 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 451 }
420 } 452 }
421 453
422 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 457 $signal->wait;
426 } else { 458 } else {
459 $busy = 0;
427 Coro::schedule; 460 Coro::schedule;
428 } 461 }
429 } 462 }
430}; 463};
431 464
432sub get_slot($;$$) { 465sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
434 467
435 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
436 469
437 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
438 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
439 473
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
725 759
726############################################################################# 760#############################################################################
727 761
728=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
729 763
730Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
733 767
734In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
786 820
787Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
789 823
790Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
792 826
793These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
794 828
795=over 4 829=over 4
1086 1120
1087sub reattach { 1121sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1123 my ($obj) = @_;
1090 1124
1125 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1127
1093 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1094 1129
1095 @$registry = (); 1130 @$registry = ();
1096 1131
1144 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1145 1180
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1150 aio_close $fh; 1188 aio_close $fh;
1151 1189
1152 if (@$objs) { 1190 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1158 aio_close $fh; 1199 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1201 }
1161 } else { 1202 } else {
1162 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1163 } 1204 }
1164 1205
1165 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1210 } else {
1167 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1168 } 1212 }
1169 } else { 1213 } else {
1170 aio_unlink $filename; 1214 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1172 } 1216 }
1263 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1264 1308
1265 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1266} 1310}
1267 1311
1312use File::Glob ();
1313
1268cf::player->attach ( 1314cf::player->attach (
1269 on_command => sub { 1315 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1271 1317
1272 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1273 or return; 1319 or return;
1274 1320
1304 1350
1305 cf::override; 1351 cf::override;
1306 }, 1352 },
1307); 1353);
1308 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1309sub load_extensions { 1368sub load_extensions {
1310 cf::sync_job { 1369 cf::sync_job {
1311 my %todo; 1370 my %todo;
1312 1371
1313 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1332 1391
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1394
1336 $ext{source} = 1395 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1339 . $source 1398 . $source
1340 . "\n};\n1"; 1399 . "\n};\n1";
1341 1400
1342 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1343 } 1402 }
1344 1403
1404 my $pass = 0;
1345 my %done; 1405 my %done;
1346 while (%todo) { 1406 while (%todo) {
1347 my $progress; 1407 my $progress;
1348 1408
1409 ++$pass;
1410
1411 ext:
1349 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1414 next ext
1352 unless exists $done{$_}; 1415 unless exists $done{$_};
1353 } 1416 }
1354 1417
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1419
1357 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1424
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1426 if exists $v->{meta}{mandatory};
1365 1427 } else {
1366 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1367 } 1434 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1435 }
1373 1436
1374 skip: 1437 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1377 } 1445 }
1378 }; 1446 };
1379} 1447}
1380 1448
1381############################################################################# 1449#############################################################################
1382 1450
1383=back 1451=back
1384 1452
1385=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1386 1454
1387Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1388 1456
1389=cut 1457=cut
1390 1458
1391package cf::player; 1459package cf::player;
1392 1460
1435 1503
1436sub exists($) { 1504sub exists($) {
1437 my ($login) = @_; 1505 my ($login) = @_;
1438 1506
1439 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1441} 1509}
1442 1510
1443sub find($) { 1511sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1513 my $login = $_[0];
1520 my ($pl) = @_; 1588 my ($pl) = @_;
1521 1589
1522 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1523 1591
1524 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1594
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1596 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1598 $pl->ob->check_score;
1616 } 1684 }
1617 1685
1618 \@paths 1686 \@paths
1619} 1687}
1620 1688
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1690
1623Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1692
1714=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1715 1694
1716Sends an ext reply to the player. 1695Sends an ext reply to the player.
1717 1696
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1770
1792 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1772 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1930 1909
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1933} 1912}
1934 1913
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1914sub decay_objects {
1945 my ($self) = @_; 1915 my ($self) = @_;
1946 1916
1947 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1948 1918
2030sub find { 2000sub find {
2031 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
2032 2002
2033 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
2034 2004
2035 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2007
2038 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2043 or return; 2010 or return;
2044 2011
2045 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2046 2013
2058 2025
2059 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2060 } 2027 }
2061} 2028}
2062 2029
2063sub pre_load { } 2030sub pre_load { }
2064sub post_load { } 2031#sub post_load { } # XS
2065 2032
2066sub load { 2033sub load {
2067 my ($self) = @_; 2034 my ($self) = @_;
2068 2035
2069 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2054 $f->skip_block;
2088 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2089 or return; 2056 or return;
2090 2057
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2092 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2093 2060
2094 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2062 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2082 $self->decay_objects;
2116 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2117 $self->update_buttons; 2084 $self->update_buttons;
2118 cf::cede_to_tick; 2085 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2086 $self->activate;
2122 } 2087 }
2123 2088
2124 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2128 } 2093 }
2129 2094
2130 $self->post_load; 2095 $self->post_load;
2131} 2096}
2132 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2133sub customise_for { 2101sub customise_for {
2134 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2135 2103
2136 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2105 if $self->per_player;
2291 2259
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2261
2294 return if $self->players; 2262 return if $self->players;
2295 2263
2296 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2297 2265
2298 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2299 2267
2300 # need to save uniques path 2268 # need to save uniques path
2301 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2392 : normalise $_ 2360 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2362 ]
2395} 2363}
2396 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2397=back 2397=back
2398 2398
2399=head3 cf::object 2399=head3 cf::object
2400 2400
2401=cut 2401=cut
2466 2466
2467our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2468 id => "say", 2468 id => "say",
2469 title => "Map", 2469 title => "Map",
2470 reply => "say ", 2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2472};
2473 2473
2474our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2475 id => "chat", 2475 id => "chat",
2476 title => "Chat", 2476 title => "Chat",
2531 2531
2532=item $player_object->enter_link 2532=item $player_object->enter_link
2533 2533
2534Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2535 2535
2536The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2538 2540
2539Will never block. 2541Will never block.
2540 2542
2541=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2542 2544
2594 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2596 2598
2597 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2600 2602
2601 $map->load; 2603 $map->load;
2602 $map->load_neighbours; 2604 $map->load_neighbours;
2603 2605
2604 return unless $self->contr->active; 2606 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2607
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2609} 2613}
2610 2614
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2616
2613Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2621be called at the end of this process.
2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2618 2625
2619=cut 2626=cut
2620 2627
2621our $GOTOGEN; 2628our $GOTOGEN;
2622 2629
2769 $self->contr->savebed ($map, $x, $y) 2776 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2777 if $exit->flag (cf::FLAG_DAMNED);
2771 2778
2772 1 2779 1
2773 }) { 2780 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2785
2779 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2796sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2798 2805
2799 utf8::encode $text; 2806 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2801} 2833}
2802 2834
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2836
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2841
2810=cut 2842=cut
2811 2843
2812# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2814 "c/identify" => { 2852 "c/identify" => {
2815 id => "infobox", 2853 id => "infobox",
2816 title => "Identify", 2854 title => "Identify",
2817 reply => undef, 2855 reply => undef,
2818 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2820 "c/examine" => { 2858 "c/examine" => {
2821 id => "infobox", 2859 id => "infobox",
2822 title => "Examine", 2860 title => "Examine",
2823 reply => undef, 2861 reply => undef,
2824 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2869 },
2826 "c/book" => { 2870 "c/book" => {
2827 id => "infobox", 2871 id => "infobox",
2828 title => "Book", 2872 title => "Book",
2829 reply => undef, 2873 reply => undef,
2845 id => "infobox", 2889 id => "infobox",
2846 title => "Body Parts", 2890 title => "Body Parts",
2847 reply => undef, 2891 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2849 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2850 "c/uptime" => { 2930 "c/uptime" => {
2851 id => "infobox", 2931 id => "infobox",
2852 title => "Uptime", 2932 title => "Uptime",
2853 reply => undef, 2933 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2934 tooltip => "How long the server has been running since last restart",
2863 id => "party", 2943 id => "party",
2864 title => "Party", 2944 title => "Party",
2865 reply => "gsay ", 2945 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2867 }, 2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2868); 2956);
2869 2957
2870sub cf::client::send_msg { 2958sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2960
2873 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2874 2963
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2965
2877 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2880 2969
2881 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2885 2972
2886 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 2978 }
2893 2979
2894 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2895 } 2981 }
2896 2982
2897 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2898 2984
2899 if ($self->can_msg) {
2900 # default colour, mask it out 2985 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2903 2988
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 2992 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 2993
2918 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 2995}
2932 2996
2933=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2934 2998
2935Sends an ext event to the client. 2999Sends an ext event to the client.
2938 3002
2939sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2941 3005
2942 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3011 }
2948} 3012}
2949 3013
2950=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2951 3015
2955 3019
2956sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2958 3022
2959 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3026 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3029 }
2966} 3030}
2967 3031
2968=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2969 3033
3070 3134
3071 $coro 3135 $coro
3072} 3136}
3073 3137
3074cf::client->attach ( 3138cf::client->attach (
3075 on_destroy => sub { 3139 on_client_destroy => sub {
3076 my ($ns) = @_; 3140 my ($ns) = @_;
3077 3141
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3143 },
3080); 3144);
3096our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3097 3161
3098$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3099 3163
3100$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3103 sort time 3167 sort time
3104)); 3168));
3105 3169
3106# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3111 3175
3112 cf::object 3176 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3115 3180
3116 cf::object::player 3181 cf::object::player
3117 player 3182 player
3118 3183
3119 cf::player 3184 cf::player
3125=cut 3190=cut
3126 3191
3127for ( 3192for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3134) { 3199) {
3135 no strict 'refs'; 3200 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3155 3220
3156 my $qcode = $code; 3221 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3159 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3160 local $_; 3228 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3229
3163 my $eval = 3230 my $eval =
3164 "do {\n" 3231 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3234 . $code
3168 . "\n}" 3235 . "\n}"
3169 ; 3236 ;
3170 3237
3238 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3174 3247
3175 if ($@) { 3248 if ($@) {
3176 warn "$@"; 3249 warn "$@";
3177 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
3197=cut 3270=cut
3198 3271
3199sub register_script_function { 3272sub register_script_function {
3200 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3201 3274
3202 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3204} 3277}
3205 3278
3206=back 3279=back
3207 3280
3208=cut 3281=cut
3229 3302
3230 $facedata->{version} == 2 3303 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3305
3233 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3309 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3312 };
3238 cf::cede_to_tick; 3313 cf::cede_to_tick;
3239 3314
3240 { 3315 {
3241 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3243 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3320
3246 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3250 3325
3251 cf::cede_to_tick; 3326 cf::cede_to_tick;
3252 } 3327 }
3253 3328
3254 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3278 3353
3279 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3280 } 3355 }
3281 3356
3282 { 3357 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3286 3359
3287 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3363
3292 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3307 } else { 3366 } else {
3308 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3309 } 3368 }
3310 3369
3393 reload_treasures; 3452 reload_treasures;
3394 3453
3395 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3396} 3455}
3397 3456
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 reload_resources;
3402}
3403
3404sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3405 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3406 or return; 3461 or return;
3407 3462
3408 local $/; 3463 local $/;
3409 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3410 3465
3411 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3412 3467
3413 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3414 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3418 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3419 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3420 }; 3475 };
3421 warn $@ if $@; 3476 warn $@ if $@;
3422 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3423} 3508}
3424 3509
3425sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
3426 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3427 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3429 (async { 3528 (async {
3430 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3431 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3432 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3433 }; 3532 };
3434 3533
3435 { 3534 evthread_start IO::AIO::poll_fileno;
3436 my $guard = freeze_mainloop; 3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3437 reload_config; 3541 reload_config;
3438 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_skills;
3547
3548 cf::init_beforeplay;
3549
3550 atomic;
3551
3439 load_extensions; 3552 load_extensions;
3440 3553
3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3554 utime time, time, $RUNTIMEFILE;
3442 evthread_start IO::AIO::poll_fileno; 3555
3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559
3560 (pop @POST_INIT)->(0) while @POST_INIT;
3443 } 3561 };
3444 3562
3445 EV::loop; 3563 main_loop;
3446} 3564}
3447 3565
3448############################################################################# 3566#############################################################################
3449# initialisation and cleanup 3567# initialisation and cleanup
3450 3568
3457 }; 3575 };
3458 } 3576 }
3459} 3577}
3460 3578
3461sub write_runtime_sync { 3579sub write_runtime_sync {
3462 my $runtime = "$LOCALDIR/runtime"; 3580 my $t0 = EV::time;
3463 3581
3464 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3466 3584
3467 IO::AIO::aio_utime $runtime, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3586
3469 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3470 3588
3471 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3590 or return;
3473 3591
3474 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
3486 aio_utime $fh, undef, undef; 3604 aio_utime $fh, undef, undef;
3487 3605
3488 close $fh 3606 close $fh
3489 or return; 3607 or return;
3490 3608
3491 aio_rename "$runtime~", $runtime 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3610 and return;
3493 3611
3494 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3495 3613
3496 1 3614 1
3497} 3615}
3498 3616
3499our $uuid_lock; 3617our $uuid_lock;
3508 my $uuid = "$LOCALDIR/uuid"; 3626 my $uuid = "$LOCALDIR/uuid";
3509 3627
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3628 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return; 3629 or return;
3512 3630
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3631 my $value = uuid_seq uuid_cur;
3632
3633 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n";
3635 return;
3636 }
3637
3638 my $value = uuid_str $value + $uuid_skip;
3514 $uuid_skip = 0; 3639 $uuid_skip = 0;
3515 3640
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3641 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return; 3642 and return;
3518 3643
3540} 3665}
3541 3666
3542sub emergency_save() { 3667sub emergency_save() {
3543 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
3544 3669
3545 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
3546 3671
3547 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
3548 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
3549 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
3550 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
3551 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
3552 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
3553 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
3554 $pl->valid or next; 3684 $pl->valid or next;
3555 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3556 $pl->save; 3686 $pl->save;
3557 } 3687 }
3558 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
3559 3689
3560 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
3561 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
3562 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
3563 $map->valid or next; 3693 $map->valid or next;
3564 $map->save; 3694 $map->save;
3565 } 3695 }
3566 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
3567 3697
3568 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
3569 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
3570 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3571 3701
3572 warn "begin write uuid\n"; 3702 warn "emergency_perl_save: begin write uuid\n";
3573 write_uuid_sync 1; 3703 write_uuid_sync 1;
3574 warn "end write uuid\n"; 3704 warn "emergency_perl_save: end write uuid\n";
3575 }; 3705 };
3576 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3577 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
3578} 3713}
3579 3714
3580sub post_cleanup { 3715sub post_cleanup {
3581 my ($make_core) = @_; 3716 my ($make_core) = @_;
3582 3717
3583 warn Carp::longmess "post_cleanup backtrace" 3718 warn Carp::longmess "post_cleanup backtrace"
3584 if $make_core; 3719 if $make_core;
3720
3721 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$;
3723}
3724
3725# a safer delete_package, copied from Symbol
3726sub clear_package($) {
3727 my $pkg = shift;
3728
3729 # expand to full symbol table name if needed
3730 unless ($pkg =~ /^main::.*::$/) {
3731 $pkg = "main$pkg" if $pkg =~ /^::/;
3732 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3733 $pkg .= '::' unless $pkg =~ /::$/;
3734 }
3735
3736 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3737 my $stem_symtab = *{$stem}{HASH};
3738
3739 defined $stem_symtab and exists $stem_symtab->{$leaf}
3740 or return;
3741
3742 # clear all symbols
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 }
3748 warn "cleared package $pkg\n";#d#
3585} 3749}
3586 3750
3587sub do_reload_perl() { 3751sub do_reload_perl() {
3588 # can/must only be called in main 3752 # can/must only be called in main
3589 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3590 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
3591 return; 3755 return;
3592 } 3756 }
3593 3757
3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3761
3762 while ($RELOAD) {
3594 warn "reloading..."; 3763 warn "reloading...";
3595 3764
3596 warn "entering sync_job"; 3765 warn "entering sync_job";
3597 3766
3598 cf::sync_job { 3767 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 3769 cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark 3770 cf::write_runtime_sync; # external watchdog should not bark
3602 3771
3603 warn "syncing database to disk"; 3772 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3773 BDB::db_env_txn_checkpoint $DB_ENV;
3605 3774
3606 # if anything goes wrong in here, we should simply crash as we already saved 3775 # if anything goes wrong in here, we should simply crash as we already saved
3607 3776
3608 warn "flushing outstanding aio requests"; 3777 warn "flushing outstanding aio requests";
3609 for (;;) {
3610 BDB::flush;
3611 IO::AIO::flush;
3612 Coro::cede_notself;
3613 last unless IO::AIO::nreqs || BDB::nreqs; 3778 while (IO::AIO::nreqs || BDB::nreqs) {
3614 warn "iterate..."; 3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3615 }
3616
3617 ++$RELOAD;
3618
3619 warn "cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = ();
3622
3623 warn "removing commands";
3624 %COMMAND = ();
3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg";
3633
3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 } 3780 }
3640 3781
3641 warn "... nuking $pkg"; 3782 warn "cancelling all extension coros";
3642 Symbol::delete_package $pkg; 3783 $_->cancel for values %EXT_CORO;
3643 } 3784 %EXT_CORO = ();
3644 3785
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3786 warn "removing commands";
3646 while (my ($k, $v) = each %INC) { 3787 %COMMAND = ();
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 3788
3789 warn "removing ext/exti commands";
3790 %EXTCMD = ();
3791 %EXTICMD = ();
3792
3793 warn "unloading/nuking all extensions";
3794 for my $pkg (@EXTS) {
3649 warn "... unloading $k"; 3795 warn "... unloading $pkg";
3650 delete $INC{$k};
3651 3796
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) { 3797 if (my $cb = $pkg->can ("unload")) {
3798 eval {
3656 $cb->(); 3799 $cb->($pkg);
3800 1
3801 } or warn "$pkg unloaded, but with errors: $@";
3802 }
3803
3804 warn "... clearing $pkg";
3805 clear_package $pkg;
3657 } 3806 }
3658 3807
3659 Symbol::delete_package $k; 3808 warn "unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811
3812 warn "... unloading $k";
3813 delete $INC{$k};
3814
3815 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g;
3817
3818 if (my $cb = $k->can ("unload_module")) {
3819 $cb->();
3820 }
3821
3822 clear_package $k;
3660 } 3823 }
3661 3824
3662 warn "getting rid of safe::, as good as possible"; 3825 warn "getting rid of safe::, as good as possible";
3663 Symbol::delete_package "safe::$_" 3826 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3828
3666 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3832
3670 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3834 # and global variables created in xs
3672 #Symbol::delete_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
3673 3836
3674 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3675 3838
3676 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3677 require cf; 3840 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3679 3842
3680 warn "loading config and database again"; 3843 warn "loading config and database again";
3681 cf::reload_config; 3844 cf::reload_config;
3682 3845
3683 warn "loading extensions"; 3846 warn "loading extensions";
3684 cf::load_extensions; 3847 cf::load_extensions;
3685 3848
3849 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
3692 3857
3858 warn "running post_init jobs";
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860
3693 warn "leaving sync_job"; 3861 warn "leaving sync_job";
3694 3862
3695 1 3863 1
3696 } or do { 3864 } or do {
3697 warn $@; 3865 warn $@;
3698 cf::cleanup "error while reloading, exiting."; 3866 cf::cleanup "error while reloading, exiting.";
3699 }; 3867 };
3700 3868
3701 warn "reloaded"; 3869 warn "reloaded";
3870 --$RELOAD;
3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3702}; 3875};
3703 3876
3704our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3705 3878
3706sub reload_perl() { 3879sub reload_perl() {
3707 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3708 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3709 3882
3883 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions;
3885
3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3711 do_reload_perl; 3887 do_reload_perl;
3712 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3889 };
3713 }; 3890 };
3714} 3891}
3715 3892
3716register_command "reload" => sub { 3893register_command "reload" => sub {
3717 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
3731 3908
3732our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3733our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3734 3911
3735sub wait_for_tick { 3912sub wait_for_tick {
3736 return if tick_inhibit || $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3737 3914
3738 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3739 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3740 $signal->wait; 3917 $signal->wait;
3741} 3918}
3742 3919
3743sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3744 return if tick_inhibit || $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3745 3922
3746 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3747 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3748 $signal->wait; 3925 $signal->wait;
3749} 3926}
3754 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3755 return; 3932 return;
3756 } 3933 }
3757 3934
3758 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3759 3938
3760 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3762 Coro::async_pool { 3941 Coro::async_pool {
3763 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
3786} 3965}
3787 3966
3788{ 3967{
3789 # configure BDB 3968 # configure BDB
3790 3969
3791 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3792 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3793 $AnyEvent::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3794 3973
3795 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3796 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3798 | BDB::LOG_AUTOREMOVE, 1); 3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3978 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3799 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3979 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3800 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3980 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3801 3981
3802 cf::sync_job { 3982 cf::sync_job {
3803 eval { 3983 eval {
3829{ 4009{
3830 # configure IO::AIO 4010 # configure IO::AIO
3831 4011
3832 IO::AIO::min_parallel 8; 4012 IO::AIO::min_parallel 8;
3833 IO::AIO::max_poll_time $TICK * 0.1; 4013 IO::AIO::max_poll_time $TICK * 0.1;
3834 $AnyEvent::AIO::WATCHER->priority (1); 4014 undef $AnyEvent::AIO::WATCHER;
3835} 4015}
3836 4016
3837my $_log_backtrace; 4017my $_log_backtrace;
3838 4018
3839sub _log_backtrace { 4019sub _log_backtrace {
3842 $msg =~ s/\n//; 4022 $msg =~ s/\n//;
3843 4023
3844 # limit the # of concurrent backtraces 4024 # limit the # of concurrent backtraces
3845 if ($_log_backtrace < 2) { 4025 if ($_log_backtrace < 2) {
3846 ++$_log_backtrace; 4026 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg;
3847 async { 4028 async {
3848 $Coro::current->{desc} = "abt $msg"; 4029 $Coro::current->{desc} = "abt $msg";
3849 4030
3850 my @bt = fork_call { 4031 my @bt = fork_call {
3851 @addr = map { sprintf "%x", $_ } @addr; 4032 @addr = map { sprintf "%x", $_ } @addr;
3862 } 4043 }
3863 4044
3864 @funcs 4045 @funcs
3865 }; 4046 };
3866 4047
3867 LOG llevInfo, "[ABT] $msg\n"; 4048 LOG llevInfo, "[ABT] $perl_bt\n";
4049 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3868 LOG llevInfo, "[ABT] $_\n" for @bt; 4050 LOG llevInfo, "[ABT] $_\n" for @bt;
3869 --$_log_backtrace; 4051 --$_log_backtrace;
3870 }; 4052 };
3871 } else { 4053 } else {
3872 LOG llevInfo, "[ABT] $msg\n"; 4054 LOG llevInfo, "[ABT] $msg\n";
3873 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3874 } 4056 }
3875} 4057}
3876 4058
3877# load additional modules 4059# load additional modules
3878use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3879 4062
3880END { cf::emergency_save } 4063END { cf::emergency_save }
3881 4064
38821 40651
3883 4066

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines