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.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 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;
43use Coro::EV;
39use Coro::AnyEvent; 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];
1465 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1466 } 1534 }
1467 } 1535 }
1468} 1536}
1469 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1470sub save($) { 1551sub save($) {
1471 my ($pl) = @_; 1552 my ($pl) = @_;
1472 1553
1473 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1474 1555
1479 1560
1480 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1482 1563
1483 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1568
1485 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1570 cf::cede_to_tick;
1487} 1571}
1488 1572
1520 my ($pl) = @_; 1604 my ($pl) = @_;
1521 1605
1522 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1523 1607
1524 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1610
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1612 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1614 $pl->ob->check_score;
1616 } 1700 }
1617 1701
1618 \@paths 1702 \@paths
1619} 1703}
1620 1704
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1706
1623Expand crossfire pod fragments into protocol xml. 1707Expand 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 1708
1714=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1715 1710
1716Sends an ext reply to the player. 1711Sends an ext reply to the player.
1717 1712
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1786
1792 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1788 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1930 1925
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1933} 1928}
1934 1929
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 { 1930sub decay_objects {
1945 my ($self) = @_; 1931 my ($self) = @_;
1946 1932
1947 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1948 1934
2030sub find { 2016sub find {
2031 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
2032 2018
2033 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
2034 2020
2035 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2023
2038 $cf::MAP{$path} || do { 2024 $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 2025 my $map = new_from_path cf::map $path
2043 or return; 2026 or return;
2044 2027
2045 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
2046 2029
2058 2041
2059 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2060 } 2043 }
2061} 2044}
2062 2045
2063sub pre_load { } 2046sub pre_load { }
2064sub post_load { } 2047#sub post_load { } # XS
2065 2048
2066sub load { 2049sub load {
2067 my ($self) = @_; 2050 my ($self) = @_;
2068 2051
2069 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2070 $f->skip_block;
2088 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
2089 or return; 2072 or return;
2090 2073
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
2092 if delete $self->{load_original}; 2075 if delete $self->{load_original};
2093 2076
2094 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2078 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2098 $self->decay_objects;
2116 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2117 $self->update_buttons; 2100 $self->update_buttons;
2118 cf::cede_to_tick; 2101 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2102 $self->activate;
2122 } 2103 }
2123 2104
2124 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2128 } 2109 }
2129 2110
2130 $self->post_load; 2111 $self->post_load;
2131} 2112}
2132 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2133sub customise_for { 2117sub customise_for {
2134 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2135 2119
2136 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2121 if $self->per_player;
2291 2275
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2277
2294 return if $self->players; 2278 return if $self->players;
2295 2279
2296 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2297 2281
2298 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2299 2283
2300 # need to save uniques path 2284 # need to save uniques path
2301 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2392 : normalise $_ 2376 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2378 ]
2395} 2379}
2396 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2397=back 2413=back
2398 2414
2399=head3 cf::object 2415=head3 cf::object
2400 2416
2401=cut 2417=cut
2466 2482
2467our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2468 id => "say", 2484 id => "say",
2469 title => "Map", 2485 title => "Map",
2470 reply => "say ", 2486 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2488};
2473 2489
2474our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2475 id => "chat", 2491 id => "chat",
2476 title => "Chat", 2492 title => "Chat",
2531 2547
2532=item $player_object->enter_link 2548=item $player_object->enter_link
2533 2549
2534Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2535 2551
2536The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2538 2556
2539Will never block. 2557Will never block.
2540 2558
2541=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2542 2560
2594 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2596 2614
2597 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2600 2618
2601 $map->load; 2619 $map->load;
2602 $map->load_neighbours; 2620 $map->load_neighbours;
2603 2621
2604 return unless $self->contr->active; 2622 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2623
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2609} 2629}
2610 2630
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2632
2613Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2772 $self->contr->savebed ($map, $x, $y) 2792 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2793 if $exit->flag (cf::FLAG_DAMNED);
2774 2794
2775 1 2795 1
2776 }) { 2796 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2801
2782 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2799sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2801 2821
2802 utf8::encode $text; 2822 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2804} 2849}
2805 2850
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2852
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2812 2857
2813=cut 2858=cut
2814 2859
2815# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2817 "c/identify" => { 2868 "c/identify" => {
2818 id => "infobox", 2869 id => "infobox",
2819 title => "Identify", 2870 title => "Identify",
2820 reply => undef, 2871 reply => undef,
2821 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2823 "c/examine" => { 2874 "c/examine" => {
2824 id => "infobox", 2875 id => "infobox",
2825 title => "Examine", 2876 title => "Examine",
2826 reply => undef, 2877 reply => undef,
2827 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2885 },
2829 "c/book" => { 2886 "c/book" => {
2830 id => "infobox", 2887 id => "infobox",
2831 title => "Book", 2888 title => "Book",
2832 reply => undef, 2889 reply => undef,
2848 id => "infobox", 2905 id => "infobox",
2849 title => "Body Parts", 2906 title => "Body Parts",
2850 reply => undef, 2907 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2852 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2853 "c/uptime" => { 2946 "c/uptime" => {
2854 id => "infobox", 2947 id => "infobox",
2855 title => "Uptime", 2948 title => "Uptime",
2856 reply => undef, 2949 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2950 tooltip => "How long the server has been running since last restart",
2866 id => "party", 2959 id => "party",
2867 title => "Party", 2960 title => "Party",
2868 reply => "gsay ", 2961 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2870 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2871); 2972);
2872 2973
2873sub cf::client::send_msg { 2974sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2976
2876 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2877 2979
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2981
2880 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2883 2985
2884 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2888 2988
2889 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 2994 }
2896 2995
2897 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2898 } 2997 }
2899 2998
2900 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2901 3000
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3001 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2906 3004
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3008 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3009
2921 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3011}
2935 3012
2936=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2937 3014
2938Sends an ext event to the client. 3015Sends an ext event to the client.
2941 3018
2942sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2944 3021
2945 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3027 }
2951} 3028}
2952 3029
2953=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2954 3031
2958 3035
2959sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2961 3038
2962 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3042 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3045 }
2969} 3046}
2970 3047
2971=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2972 3049
3073 3150
3074 $coro 3151 $coro
3075} 3152}
3076 3153
3077cf::client->attach ( 3154cf::client->attach (
3078 on_destroy => sub { 3155 on_client_destroy => sub {
3079 my ($ns) = @_; 3156 my ($ns) = @_;
3080 3157
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3159 },
3083); 3160);
3099our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3100 3177
3101$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3102 3179
3103$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3106 sort time 3183 sort time
3107)); 3184));
3108 3185
3109# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3114 3191
3115 cf::object 3192 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3118 3196
3119 cf::object::player 3197 cf::object::player
3120 player 3198 player
3121 3199
3122 cf::player 3200 cf::player
3128=cut 3206=cut
3129 3207
3130for ( 3208for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3137) { 3215) {
3138 no strict 'refs'; 3216 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3158 3236
3159 my $qcode = $code; 3237 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3162 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3163 local $_; 3244 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3245
3166 my $eval = 3246 my $eval =
3167 "do {\n" 3247 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3250 . $code
3171 . "\n}" 3251 . "\n}"
3172 ; 3252 ;
3173 3253
3254 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3177 3263
3178 if ($@) { 3264 if ($@) {
3179 warn "$@"; 3265 warn "$@";
3180 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3200=cut 3286=cut
3201 3287
3202sub register_script_function { 3288sub register_script_function {
3203 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3204 3290
3205 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3207} 3293}
3208 3294
3209=back 3295=back
3210 3296
3211=cut 3297=cut
3232 3318
3233 $facedata->{version} == 2 3319 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3321
3236 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3325 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3328 };
3241 cf::cede_to_tick; 3329 cf::cede_to_tick;
3242 3330
3243 { 3331 {
3244 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3246 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3336
3249 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3341
3254 cf::cede_to_tick; 3342 cf::cede_to_tick;
3255 } 3343 }
3256 3344
3257 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3281 3369
3282 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3283 } 3371 }
3284 3372
3285 { 3373 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3289 3375
3290 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3379
3295 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3310 } else { 3382 } else {
3311 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3312 } 3384 }
3313 3385
3396 reload_treasures; 3468 reload_treasures;
3397 3469
3398 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3399} 3471}
3400 3472
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3477 or return;
3412 3478
3413 local $/; 3479 local $/;
3414 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3415 3481
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3417 3483
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3491 };
3426 warn $@ if $@; 3492 warn $@ if $@;
3427 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3428} 3524}
3429 3525
3430sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3431 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3544 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3438 }; 3548 };
3439 3549
3440 { 3550 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3442 reload_config; 3557 reload_config;
3443 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3444 load_extensions; 3568 load_extensions;
3445 3569
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3570 utime time, time, $RUNTIMEFILE;
3571
3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3577 };
3448 3578
3449 EV::loop; 3579 main_loop;
3450} 3580}
3451 3581
3452############################################################################# 3582#############################################################################
3453# initialisation and cleanup 3583# initialisation and cleanup
3454 3584
3461 }; 3591 };
3462 } 3592 }
3463} 3593}
3464 3594
3465sub write_runtime_sync { 3595sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = EV::time;
3467 3597
3468 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3470 3600
3471 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3602
3473 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3474 3604
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3606 or return;
3477 3607
3478 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3491 3621
3492 close $fh 3622 close $fh
3493 or return; 3623 or return;
3494 3624
3495 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3626 and return;
3497 3627
3498 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3499 3629
3500 1 3630 1
3501} 3631}
3502 3632
3503our $uuid_lock; 3633our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 3642 my $uuid = "$LOCALDIR/uuid";
3513 3643
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3645 or return;
3516 3646
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3655 $uuid_skip = 0;
3519 3656
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3658 and return;
3522 3659
3544} 3681}
3545 3682
3546sub emergency_save() { 3683sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3548 3685
3549 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3550 3687
3551 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3552 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3700 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3702 $pl->save;
3561 } 3703 }
3562 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3563 3705
3564 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3709 $map->valid or next;
3568 $map->save; 3710 $map->save;
3569 } 3711 }
3570 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3571 3713
3572 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3575 3717
3576 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3719 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3579 }; 3721 };
3580 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3581 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3582} 3729}
3583 3730
3584sub post_cleanup { 3731sub post_cleanup {
3585 my ($make_core) = @_; 3732 my ($make_core) = @_;
3586 3733
3587 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3589} 3765}
3590 3766
3591sub do_reload_perl() { 3767sub do_reload_perl() {
3592 # can/must only be called in main 3768 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3595 return; 3771 return;
3596 } 3772 }
3597 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3777
3778 while ($RELOAD) {
3598 warn "reloading..."; 3779 warn "reloading...";
3599 3780
3600 warn "entering sync_job"; 3781 warn "entering sync_job";
3601 3782
3602 cf::sync_job { 3783 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3785 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3606 3787
3607 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3790
3610 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3611 3792
3612 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3796 }
3644 3797
3645 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3647 } 3800 %EXT_CORO = ();
3648 3801
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3812
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3660 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3661 } 3822 }
3662 3823
3663 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3664 } 3839 }
3665 3840
3666 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3844
3670 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3848
3674 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3850 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3677 3852
3678 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3679 3854
3680 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3681 require cf; 3856 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3683 3858
3684 warn "loading config and database again"; 3859 warn "loading config and database again";
3685 cf::reload_config; 3860 cf::reload_config;
3686 3861
3687 warn "loading extensions"; 3862 warn "loading extensions";
3688 cf::load_extensions; 3863 cf::load_extensions;
3689 3864
3865 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3696 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3697 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3698 3878
3699 1 3879 1
3700 } or do { 3880 } or do {
3701 warn $@; 3881 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3703 }; 3883 };
3704 3884
3705 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3706}; 3891};
3707 3892
3708our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3709 3894
3710sub reload_perl() { 3895sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3713 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3903 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3717 }; 3906 };
3718} 3907}
3719 3908
3720register_command "reload" => sub { 3909register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3735 3924
3736our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3738 3927
3739sub wait_for_tick { 3928sub wait_for_tick {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3930
3742 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 3933 $signal->wait;
3745} 3934}
3746 3935
3747sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 3938
3750 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 3941 $signal->wait;
3753} 3942}
3758 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3759 return; 3948 return;
3760 } 3949 }
3761 3950
3762 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3763 3954
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 3957 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3790} 3981}
3791 3982
3792{ 3983{
3793 # configure BDB 3984 # configure BDB
3794 3985
3795 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3798 3989
3799 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 | BDB::LOG_AUTOREMOVE, 1); 3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3803 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3804 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3805 3997
3806 cf::sync_job { 3998 cf::sync_job {
3807 eval { 3999 eval {
3846 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3847 4039
3848 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3849 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3850 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3851 async { 4044 async {
3852 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3853 4046
3854 my @bt = fork_call { 4047 my @bt = fork_call {
3855 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3866 } 4059 }
3867 4060
3868 @funcs 4061 @funcs
3869 }; 4062 };
3870 4063
3871 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4067 --$_log_backtrace;
3874 }; 4068 };
3875 } else { 4069 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4072 }
3879} 4073}
3880 4074
3881# load additional modules 4075# load additional modules
3882use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3883 4078
3884END { cf::emergency_save } 4079END { cf::emergency_save }
3885 4080
38861 40811
3887 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines