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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.484 by root, Mon Oct 12 14:00:58 2009 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 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 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
35 37
38use Guard ();
36use Coro 4.50 (); 39use Coro ();
37use Coro::State; 40use Coro::State;
38use Coro::Handle; 41use Coro::Handle;
39use Coro::EV; 42use Coro::EV;
43use Coro::AnyEvent;
40use Coro::Timer; 44use Coro::Timer;
41use Coro::Signal; 45use Coro::Signal;
42use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
43use Coro::AIO; 49use Coro::AIO;
44use Coro::BDB; 50use Coro::BDB 1.6;
45use Coro::Storable; 51use Coro::Storable;
46use Coro::Util (); 52use Coro::Util ();
47 53
48use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
49use BDB (); 55use BDB ();
50use Data::Dumper; 56use Data::Dumper;
51use Digest::MD5; 57use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub 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::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
… …
195 232
196This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 235that call.
199 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
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $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;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
… …
296our $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
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks 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
313deadlocked coro. 367deadlocked coro.
… …
319 373
320Return 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.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like 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
… …
724 752
725############################################################################# 753#############################################################################
726 754
727=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
728 756
729Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
732 760
733In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
785 813
786Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
788 816
789Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
791 819
792These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
793 821
794=over 4 822=over 4
… …
1085 1113
1086sub reattach { 1114sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1116 my ($obj) = @_;
1089 1117
1118 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1120
1092 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1093 1122
1094 @$registry = (); 1123 @$registry = ();
1095 1124
… …
1143 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1144 1173
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1149 aio_close $fh; 1181 aio_close $fh;
1150 1182
1151 if (@$objs) { 1183 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1157 aio_close $fh; 1192 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1194 }
1160 } else { 1195 } else {
1161 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1162 } 1197 }
1163 1198
1164 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1203 } else {
1166 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1167 } 1205 }
1168 } else { 1206 } else {
1169 aio_unlink $filename; 1207 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1171 } 1209 }
… …
1262 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1263 1301
1264 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1265} 1303}
1266 1304
1305use File::Glob ();
1306
1267cf::player->attach ( 1307cf::player->attach (
1268 on_command => sub { 1308 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1270 1310
1271 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1303 1343
1304 cf::override; 1344 cf::override;
1305 }, 1345 },
1306); 1346);
1307 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1308sub load_extensions { 1361sub load_extensions {
1309 cf::sync_job { 1362 cf::sync_job {
1310 my %todo; 1363 my %todo;
1311 1364
1312 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
… …
1331 1384
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1387
1335 $ext{source} = 1388 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1338 . $source 1391 . $source
1339 . "\n};\n1"; 1392 . "\n};\n1";
1340 1393
1341 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1381 1434
1382=back 1435=back
1383 1436
1384=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1385 1438
1386Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1387 1440
1388=cut 1441=cut
1389 1442
1390package cf::player; 1443package cf::player;
1391 1444
… …
1434 1487
1435sub exists($) { 1488sub exists($) {
1436 my ($login) = @_; 1489 my ($login) = @_;
1437 1490
1438 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1440} 1493}
1441 1494
1442sub find($) { 1495sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1497 my $login = $_[0];
… …
1519 my ($pl) = @_; 1572 my ($pl) = @_;
1520 1573
1521 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1522 1575
1523 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1578
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1530 1585
1531 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1668 }
1614 1669
1615 \@paths 1670 \@paths
1616} 1671}
1617 1672
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1674
1620Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1676
1711=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1712 1678
1713Sends an ext reply to the player. 1679Sends an ext reply to the player.
1714 1680
… …
1927 1893
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1930} 1896}
1931 1897
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1898sub decay_objects {
1942 my ($self) = @_; 1899 my ($self) = @_;
1943 1900
1944 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1945 1902
… …
2027sub find { 1984sub find {
2028 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2029 1986
2030 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2031 1988
2032 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1991
2035 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2040 or return; 1994 or return;
2041 1995
2042 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2043 1997
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2038 $f->skip_block;
2085 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2086 or return; 2040 or return;
2087 2041
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2089 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2090 2044
2091 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2046 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
… …
2111 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2066 $self->decay_objects;
2113 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2114 $self->update_buttons; 2068 $self->update_buttons;
2115 cf::cede_to_tick; 2069 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2070 $self->activate;
2119 } 2071 }
2120 2072
2121 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2288 2240
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2242
2291 return if $self->players; 2243 return if $self->players;
2292 2244
2293 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2294 2246
2295 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2296 2248
2297 # need to save uniques path 2249 # need to save uniques path
2298 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2463 2415
2464our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2465 id => "say", 2417 id => "say",
2466 title => "Map", 2418 title => "Map",
2467 reply => "say ", 2419 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2421};
2470 2422
2471our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2472 id => "chat", 2424 id => "chat",
2473 title => "Chat", 2425 title => "Chat",
… …
2528 2480
2529=item $player_object->enter_link 2481=item $player_object->enter_link
2530 2482
2531Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2532 2484
2533The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2535 2489
2536Will never block. 2490Will never block.
2537 2491
2538=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2539 2493
… …
2597 2551
2598 $map->load; 2552 $map->load;
2599 $map->load_neighbours; 2553 $map->load_neighbours;
2600 2554
2601 return unless $self->contr->active; 2555 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2556
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2606} 2562}
2607 2563
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2609 2565
2610Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2568that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2569the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2570be called at the end of this process.
2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2615 2574
2616=cut 2575=cut
2617 2576
2618our $GOTOGEN; 2577our $GOTOGEN;
2619 2578
… …
2766 $self->contr->savebed ($map, $x, $y) 2725 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2726 if $exit->flag (cf::FLAG_DAMNED);
2768 2727
2769 1 2728 1
2770 }) { 2729 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2734
2776 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
… …
2842 id => "infobox", 2801 id => "infobox",
2843 title => "Body Parts", 2802 title => "Body Parts",
2844 reply => undef, 2803 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2804 tooltip => "Shows which body parts you posess and are available",
2846 }, 2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2812 "c/skills" => {
2813 id => "infobox",
2814 title => "Skills",
2815 reply => undef,
2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2841 },
2847 "c/uptime" => { 2842 "c/uptime" => {
2848 id => "infobox", 2843 id => "infobox",
2849 title => "Uptime", 2844 title => "Uptime",
2850 reply => undef, 2845 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2846 tooltip => "How long the server has been running since last restart",
… …
2860 id => "party", 2855 id => "party",
2861 title => "Party", 2856 title => "Party",
2862 reply => "gsay ", 2857 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 2858 tooltip => "Messages and chat related to your party",
2864 }, 2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2865); 2868);
2866 2869
2867sub cf::client::send_msg { 2870sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2872
2870 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg)
2874 unless $color & cf::NDI_VERBATIM;
2871 2875
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2876 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2877
2874 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2879 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 2880 $channel = $CHANNEL{$channel};
2877 2881
2878 $self->ext_msg (channel_info => $channel) 2882 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 2883 $channel = $channel->{id};
2882 2884
2883 } elsif (ref $channel) { 2885 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 2890 }
2890 2891
2891 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2892 } 2893 }
2893 2894
2894 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2895 2896
2896 if ($self->can_msg) {
2897 # default colour, mask it out 2897 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2900 2900
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2901 my $pkt = "msg "
2902 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 2904 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 2905
2915 $color &= cf::NDI_COLOR_MASK; 2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2916 2909
2917 utf8::encode $msg; 2910 # split very large packets
2918 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2919 if (0 && $msg =~ /\[/) { 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2920 # COMMAND/INFO 2913 $pkt = "frag";
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 } 2914 }
2915
2916 $self->send_packet ($pkt);
2928} 2917}
2929 2918
2930=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2931 2920
2932Sends an ext event to the client. 2921Sends an ext event to the client.
… …
3107The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
3108 3097
3109 cf::object 3098 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3099 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3100 insert remove name archname title slaying race decrease split
3101 value
3112 3102
3113 cf::object::player 3103 cf::object::player
3114 player 3104 player
3115 3105
3116 cf::player 3106 cf::player
… …
3121 3111
3122=cut 3112=cut
3123 3113
3124for ( 3114for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3116 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3117 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
3131) { 3121) {
3132 no strict 'refs'; 3122 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3151 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
3152 3142
3153 my $qcode = $code; 3143 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
3156 3148
3157 local $_; 3149 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
3159 3151
3160 my $eval = 3152 my $eval =
… …
3390 reload_treasures; 3382 reload_treasures;
3391 3383
3392 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
3393} 3385}
3394 3386
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3387sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3388 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3389 or return;
3404 3390
3405 local $/; 3391 local $/;
3406 *CFG = YAML::Load <$fh>; 3392 *CFG = YAML::XS::Load <$fh>;
3407 3393
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3409 3395
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3396 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3417 }; 3403 };
3418 warn $@ if $@; 3404 warn $@ if $@;
3419 } 3405 }
3420} 3406}
3421 3407
3408sub pidfile() {
3409 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3410 or die "$PIDFILE: $!";
3411 flock $fh, &Fcntl::LOCK_EX
3412 or die "$PIDFILE: flock: $!";
3413 $fh
3414}
3415
3416# make sure only one server instance is running at any one time
3417sub atomic {
3418 my $fh = pidfile;
3419
3420 my $pid = <$fh>;
3421 kill 9, $pid if $pid > 0;
3422
3423 seek $fh, 0, 0;
3424 print $fh $$;
3425}
3426
3427sub main_loop {
3428 warn "EV::loop starting\n";
3429 if (1) {
3430 EV::loop;
3431 }
3432 warn "EV::loop returned\n";
3433 goto &main_loop unless $REALLY_UNLOOP;
3434}
3435
3422sub main { 3436sub main {
3437 cf::init_globals; # initialise logging
3438
3439 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3440 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3441 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3442 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3443
3444 cf::init_experience;
3445 cf::init_anim;
3446 cf::init_attackmess;
3447 cf::init_dynamic;
3448
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450
3423 # we must not ever block the main coroutine 3451 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3452 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3453 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3454 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3455 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3456 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3457 })->prio (Coro::PRIO_MAX);
3430 }; 3458 };
3431 3459
3432 { 3460 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3461
3462 cf::sync_job {
3463 reload_resources;
3434 reload_config; 3464 reload_config;
3435 db_init; 3465 db_init;
3466
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid;
3470 cf::init_signals;
3471 cf::init_commands;
3472 cf::init_skills;
3473
3474 cf::init_beforeplay;
3475
3476 atomic;
3477
3436 load_extensions; 3478 load_extensions;
3437 3479
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3480 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3481
3482 # no (long-running) fork's whatsoever before this point(!)
3483 use POSIX ();
3484 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3485
3486 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3487 };
3441 3488
3442 EV::loop; 3489 main_loop;
3443} 3490}
3444 3491
3445############################################################################# 3492#############################################################################
3446# initialisation and cleanup 3493# initialisation and cleanup
3447 3494
… …
3454 }; 3501 };
3455 } 3502 }
3456} 3503}
3457 3504
3458sub write_runtime_sync { 3505sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3506 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3507 # the fsync below can take a very very long time.
3463 3508
3464 IO::AIO::aio_utime $runtime, undef, undef; 3509 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3510
3466 my $guard = cf::lock_acquire "write_runtime"; 3511 my $guard = cf::lock_acquire "write_runtime";
3467 3512
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3513 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3514 or return;
3470 3515
3471 my $value = $cf::RUNTIME + 90 + 10; 3516 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3517 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3518 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3528 aio_utime $fh, undef, undef;
3484 3529
3485 close $fh 3530 close $fh
3486 or return; 3531 or return;
3487 3532
3488 aio_rename "$runtime~", $runtime 3533 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3534 and return;
3490 3535
3491 warn "runtime file written.\n"; 3536 warn "runtime file written.\n";
3492 3537
3493 1 3538 1
… …
3505 my $uuid = "$LOCALDIR/uuid"; 3550 my $uuid = "$LOCALDIR/uuid";
3506 3551
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3552 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3553 or return;
3509 3554
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3555 my $value = uuid_seq uuid_cur;
3556
3557 unless ($value) {
3558 warn "cowardly refusing to write zero uuid value!\n";
3559 return;
3560 }
3561
3562 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3563 $uuid_skip = 0;
3512 3564
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3565 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3566 and return;
3515 3567
… …
3537} 3589}
3538 3590
3539sub emergency_save() { 3591sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3592 my $freeze_guard = cf::freeze_mainloop;
3541 3593
3542 warn "enter emergency perl save\n"; 3594 warn "emergency_perl_save: enter\n";
3543 3595
3544 cf::sync_job { 3596 cf::sync_job {
3597 # this is a trade-off: we want to be very quick here, so
3598 # save all maps without fsync, and later call a global sync
3599 # (which in turn might be very very slow)
3600 local $USE_FSYNC = 0;
3601
3545 # use a peculiar iteration method to avoid tripping on perl 3602 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3603 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3604 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3605 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3606 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3607 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3608 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3609 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3610 $pl->save;
3554 } 3611 }
3555 warn "end emergency player save\n"; 3612 warn "emergency_perl_save: end player save\n";
3556 3613
3557 warn "begin emergency map save\n"; 3614 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3615 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3616 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3617 $map->valid or next;
3561 $map->save; 3618 $map->save;
3562 } 3619 }
3563 warn "end emergency map save\n"; 3620 warn "emergency_perl_save: end map save\n";
3564 3621
3565 warn "begin emergency database checkpoint\n"; 3622 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3623 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3624 warn "emergency_perl_save: end database checkpoint\n";
3568 3625
3569 warn "begin write uuid\n"; 3626 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3627 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3628 warn "emergency_perl_save: end write uuid\n";
3572 }; 3629 };
3573 3630
3631 warn "emergency_perl_save: starting sync()\n";
3632 IO::AIO::aio_sync sub {
3633 warn "emergency_perl_save: finished sync()\n";
3634 };
3635
3574 warn "leave emergency perl save\n"; 3636 warn "emergency_perl_save: leave\n";
3575} 3637}
3576 3638
3577sub post_cleanup { 3639sub post_cleanup {
3578 my ($make_core) = @_; 3640 my ($make_core) = @_;
3579 3641
3580 warn Carp::longmess "post_cleanup backtrace" 3642 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3643 if $make_core;
3644
3645 my $fh = pidfile;
3646 unlink $PIDFILE if <$fh> == $$;
3647}
3648
3649# a safer delete_package, copied from Symbol
3650sub clear_package($) {
3651 my $pkg = shift;
3652
3653 # expand to full symbol table name if needed
3654 unless ($pkg =~ /^main::.*::$/) {
3655 $pkg = "main$pkg" if $pkg =~ /^::/;
3656 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3657 $pkg .= '::' unless $pkg =~ /::$/;
3658 }
3659
3660 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3661 my $stem_symtab = *{$stem}{HASH};
3662
3663 defined $stem_symtab and exists $stem_symtab->{$leaf}
3664 or return;
3665
3666 # clear all symbols
3667 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3668 for my $name (keys %$leaf_symtab) {
3669 _gv_clear *{"$pkg$name"};
3670# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3671 }
3672 warn "cleared package $pkg\n";#d#
3582} 3673}
3583 3674
3584sub do_reload_perl() { 3675sub do_reload_perl() {
3585 # can/must only be called in main 3676 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3677 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3678 warn "can only reload from main coroutine";
3588 return; 3679 return;
3589 } 3680 }
3590 3681
3682 return if $RELOAD++;
3683
3684 my $t1 = EV::time;
3685
3686 while ($RELOAD) {
3591 warn "reloading..."; 3687 warn "reloading...";
3592 3688
3593 warn "entering sync_job"; 3689 warn "entering sync_job";
3594 3690
3595 cf::sync_job { 3691 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3692 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3693 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3694 cf::write_runtime_sync; # external watchdog should not bark
3599 3695
3600 warn "syncing database to disk"; 3696 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3698
3603 # if anything goes wrong in here, we should simply crash as we already saved 3699 # if anything goes wrong in here, we should simply crash as we already saved
3604 3700
3605 warn "flushing outstanding aio requests"; 3701 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3702 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3703 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3704 }
3637 3705
3638 warn "... nuking $pkg"; 3706 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3707 $_->cancel for values %EXT_CORO;
3640 } 3708 %EXT_CORO = ();
3641 3709
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3710 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3711 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3712
3713 warn "removing ext/exti commands";
3714 %EXTCMD = ();
3715 %EXTICMD = ();
3716
3717 warn "unloading/nuking all extensions";
3718 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3719 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3720
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3721 if (my $cb = $pkg->can ("unload")) {
3722 eval {
3653 $cb->(); 3723 $cb->($pkg);
3724 1
3725 } or warn "$pkg unloaded, but with errors: $@";
3726 }
3727
3728 warn "... clearing $pkg";
3729 clear_package $pkg;
3654 } 3730 }
3655 3731
3656 Symbol::delete_package $k; 3732 warn "unloading all perl modules loaded from $LIBDIR";
3733 while (my ($k, $v) = each %INC) {
3734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3735
3736 warn "... unloading $k";
3737 delete $INC{$k};
3738
3739 $k =~ s/\.pm$//;
3740 $k =~ s/\//::/g;
3741
3742 if (my $cb = $k->can ("unload_module")) {
3743 $cb->();
3744 }
3745
3746 clear_package $k;
3657 } 3747 }
3658 3748
3659 warn "getting rid of safe::, as good as possible"; 3749 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3750 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3752
3663 warn "unloading cf.pm \"a bit\""; 3753 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3754 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3755 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 3756
3667 # don't, removes xs symbols, too, 3757 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3758 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3759 #clear_package __PACKAGE__;
3670 3760
3671 warn "unload completed, starting to reload now"; 3761 warn "unload completed, starting to reload now";
3672 3762
3673 warn "reloading cf.pm"; 3763 warn "reloading cf.pm";
3674 require cf; 3764 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3765 cf::_connect_to_perl_1;
3676 3766
3677 warn "loading config and database again"; 3767 warn "loading config and database again";
3678 cf::reload_config; 3768 cf::reload_config;
3679 3769
3680 warn "loading extensions"; 3770 warn "loading extensions";
3681 cf::load_extensions; 3771 cf::load_extensions;
3682 3772
3773 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3774 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3775 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3776 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3777 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3778 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3779 reattach $_ for values %PLAYER;
3780 }
3689 3781
3782 warn "running post_init jobs";
3783 (pop @POST_INIT)->(1) while @POST_INIT;
3784
3690 warn "leaving sync_job"; 3785 warn "leaving sync_job";
3691 3786
3692 1 3787 1
3693 } or do { 3788 } or do {
3694 warn $@; 3789 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3790 cf::cleanup "error while reloading, exiting.";
3696 }; 3791 };
3697 3792
3698 warn "reloaded"; 3793 warn "reloaded";
3794 --$RELOAD;
3795 }
3796
3797 $t1 = EV::time - $t1;
3798 warn "reload completed in ${t1}s\n";
3699}; 3799};
3700 3800
3701our $RELOAD_WATCHER; # used only during reload 3801our $RELOAD_WATCHER; # used only during reload
3702 3802
3703sub reload_perl() { 3803sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3804 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3805 # coro crashes during coro_state_free->destroy here.
3706 3806
3807 $RELOAD_WATCHER ||= cf::async {
3808 Coro::AIO::aio_wait cache_extensions;
3809
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3811 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3812 undef $RELOAD_WATCHER;
3813 };
3710 }; 3814 };
3711} 3815}
3712 3816
3713register_command "reload" => sub { 3817register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3818 my ($who, $arg) = @_;
… …
3785{ 3889{
3786 # configure BDB 3890 # configure BDB
3787 3891
3788 BDB::min_parallel 8; 3892 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3893 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3894 $AnyEvent::BDB::WATCHER->priority (1);
3791 3895
3792 unless ($DB_ENV) { 3896 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3897 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3898 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3899 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3900 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3902 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3903
3799 cf::sync_job { 3904 cf::sync_job {
3800 eval { 3905 eval {
… …
3826{ 3931{
3827 # configure IO::AIO 3932 # configure IO::AIO
3828 3933
3829 IO::AIO::min_parallel 8; 3934 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3935 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3936 undef $AnyEvent::AIO::WATCHER;
3832} 3937}
3833 3938
3834my $_log_backtrace; 3939my $_log_backtrace;
3835 3940
3836sub _log_backtrace { 3941sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3944 $msg =~ s/\n//;
3840 3945
3841 # limit the # of concurrent backtraces 3946 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3947 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3948 ++$_log_backtrace;
3949 my $perl_bt = Carp::longmess $msg;
3844 async { 3950 async {
3845 $Coro::current->{desc} = "abt $msg"; 3951 $Coro::current->{desc} = "abt $msg";
3846 3952
3847 my @bt = fork_call { 3953 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3954 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3965 }
3860 3966
3861 @funcs 3967 @funcs
3862 }; 3968 };
3863 3969
3864 LOG llevInfo, "[ABT] $msg\n"; 3970 LOG llevInfo, "[ABT] $perl_bt\n";
3971 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3972 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3973 --$_log_backtrace;
3867 }; 3974 };
3868 } else { 3975 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3976 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 3977 LOG llevInfo, "[ABT] [suppressed]\n";
3871 } 3978 }
3872} 3979}
3873 3980
3874# load additional modules 3981# load additional modules
3875use cf::pod; 3982require "cf/$_.pm" for @EXTRA_MODULES;
3983cf::_connect_to_perl_2;
3876 3984
3877END { cf::emergency_save } 3985END { cf::emergency_save }
3878 3986
38791 39871
3880 3988

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines