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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 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; 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 1.6; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5; 58use Digest::MD5;
53use Fcntl; 59use Fcntl;
54use YAML (); 60use YAML::XS ();
55use IO::AIO (); 61use IO::AIO ();
56use Time::HiRes; 62use Time::HiRes;
57use Compress::LZF; 63use Compress::LZF;
58use Digest::MD5 (); 64use Digest::MD5 ();
59 65
61 67
62# configure various modules to our taste 68# configure various modules to our taste
63# 69#
64$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 78
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 81
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 83
72our %COMMAND = (); 84our %COMMAND = ();
73our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
76our %EXTCMD = (); 88our %EXTCMD = ();
77our %EXTICMD = (); 89our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
80 92
81our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
83 97
84our $CONFDIR = confdir; 98our $CONFDIR = confdir;
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
95our %RESOURCE; 112our %RESOURCE;
96 113
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 116our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
101 118
102our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 122our $DB_ENV;
106 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
107our %CFG; 126our %CFG;
108 127
109our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 129our $RUNTIME;
111our $NOW; 130our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 141our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
124 143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
148
125binmode STDOUT; 149binmode STDOUT;
126binmode STDERR; 150binmode STDERR;
127 151
128# read virtual server time, if available 152# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
133} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
134 160
135mkdir $_ 161mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 163
138our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
139 165
140sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 178
142############################################################################# 179#############################################################################
143 180
144=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
145 182
192returns directly I<after> the tick processing (and consequently, can only wake one process 229returns 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. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 231
195=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
196 233
197This array contains the results of the last C<invoke ()> call. When 234This 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 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 236that call.
200 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
201=back 244=back
202 245
203=cut 246=cut
204 247
205BEGIN { 248$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 249 my $msg = join "", @_;
208 250
209 $msg .= "\n" 251 $msg .= "\n"
210 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
211 253
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 255
214 LOG llevError, $msg; 256 LOG llevError, $msg;
215 }; 257};
216}
217 258
218$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
220 263
221 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 266 return;#d#
224 }#d# 267 }#d#
225 268
226 # kill coroutine otherwise 269 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 270 Coro::terminate
229}; 271};
230
231$SIG{__DIE__} = sub { }; #d#?
232 272
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 283for my $pkg (qw(
244 cf::global cf::attachable 284 cf::global cf::attachable
245 cf::object cf::object::player 285 cf::object cf::object::player
246 cf::client cf::player 286 cf::client cf::player
247 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
248 cf::map cf::party cf::region 289 cf::party cf::region
249)) { 290)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 292}
253 293
254$EV::DIED = sub { 294$EV::DIED = sub {
255 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
256}; 296};
257 297
258############################################################################# 298#############################################################################
259 299
260=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 338
299sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
301 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
302=item cf::lock_wait $string 356=item cf::lock_wait $string
303 357
304Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
305 359
306=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
307 361
308Wait until the given lock is available and then acquires it and returns 362Wait 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, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
311returned. 365returned.
312 366
313Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 368deadlocked coro.
320 374
321Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
322 376
323=cut 377=cut
324 378
325our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 380
328sub lock_wait($) { 381sub lock_wait($) {
329 my ($key) = @_; 382 $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} 383}
342 384
343sub lock_acquire($) { 385sub lock_acquire($) {
344 my ($key) = @_; 386 $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} 387}
358 388
359sub lock_active($) { 389sub lock_active($) {
360 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 391}
364 392
365sub freeze_mainloop { 393sub freeze_mainloop {
366 tick_inhibit_inc; 394 tick_inhibit_inc;
367 395
368 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
369} 397}
370 398
371=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
372 400
373Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
725 753
726############################################################################# 754#############################################################################
727 755
728=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
729 757
730Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
733 761
734In the following description, CLASS can be any of C<global>, C<object> 762In 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 763C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
786 814
787Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
789 817
790Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
792 820
793These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
794 822
795=over 4 823=over 4
1086 1114
1087sub reattach { 1115sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1117 my ($obj) = @_;
1090 1118
1119 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1121
1093 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1094 1123
1095 @$registry = (); 1124 @$registry = ();
1096 1125
1144 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1145 1174
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1150 aio_close $fh; 1182 aio_close $fh;
1151 1183
1152 if (@$objs) { 1184 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1158 aio_close $fh; 1193 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1195 }
1161 } else { 1196 } else {
1162 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1163 } 1198 }
1164 1199
1165 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1204 } else {
1167 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1168 } 1206 }
1169 } else { 1207 } else {
1170 aio_unlink $filename; 1208 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1172 } 1210 }
1263 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1264 1302
1265 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1266} 1304}
1267 1305
1306use File::Glob ();
1307
1268cf::player->attach ( 1308cf::player->attach (
1269 on_command => sub { 1309 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1271 1311
1272 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1304 1344
1305 cf::override; 1345 cf::override;
1306 }, 1346 },
1307); 1347);
1308 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1309sub load_extensions { 1362sub load_extensions {
1310 cf::sync_job { 1363 cf::sync_job {
1311 my %todo; 1364 my %todo;
1312 1365
1313 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1332 1385
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1388
1336 $ext{source} = 1389 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1339 . $source 1392 . $source
1340 . "\n};\n1"; 1393 . "\n};\n1";
1341 1394
1342 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1382 1435
1383=back 1436=back
1384 1437
1385=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1386 1439
1387Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1388 1441
1389=cut 1442=cut
1390 1443
1391package cf::player; 1444package cf::player;
1392 1445
1435 1488
1436sub exists($) { 1489sub exists($) {
1437 my ($login) = @_; 1490 my ($login) = @_;
1438 1491
1439 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1441} 1494}
1442 1495
1443sub find($) { 1496sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1498 my $login = $_[0];
1520 my ($pl) = @_; 1573 my ($pl) = @_;
1521 1574
1522 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1523 1576
1524 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1579
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1581 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1583 $pl->ob->check_score;
1616 } 1669 }
1617 1670
1618 \@paths 1671 \@paths
1619} 1672}
1620 1673
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1675
1623Expand crossfire pod fragments into protocol xml. 1676Expand 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 1677
1714=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1715 1679
1716Sends an ext reply to the player. 1680Sends an ext reply to the player.
1717 1681
1930 1894
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1933} 1897}
1934 1898
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 { 1899sub decay_objects {
1945 my ($self) = @_; 1900 my ($self) = @_;
1946 1901
1947 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1948 1903
2030sub find { 1985sub find {
2031 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2032 1987
2033 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2034 1989
2035 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1992
2038 $cf::MAP{$path} || do { 1993 $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 1994 my $map = new_from_path cf::map $path
2043 or return; 1995 or return;
2044 1996
2045 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2046 1998
2114 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2067 $self->decay_objects;
2116 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2117 $self->update_buttons; 2069 $self->update_buttons;
2118 cf::cede_to_tick; 2070 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2071 $self->activate;
2122 } 2072 }
2123 2073
2124 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2291 2241
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2243
2294 return if $self->players; 2244 return if $self->players;
2295 2245
2296 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2297 2247
2298 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2299 2249
2300 # need to save uniques path 2250 # need to save uniques path
2301 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2392 : normalise $_ 2342 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2344 ]
2395} 2345}
2396 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2397=back 2379=back
2398 2380
2399=head3 cf::object 2381=head3 cf::object
2400 2382
2401=cut 2383=cut
2466 2448
2467our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2468 id => "say", 2450 id => "say",
2469 title => "Map", 2451 title => "Map",
2470 reply => "say ", 2452 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2454};
2473 2455
2474our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2475 id => "chat", 2457 id => "chat",
2476 title => "Chat", 2458 title => "Chat",
2531 2513
2532=item $player_object->enter_link 2514=item $player_object->enter_link
2533 2515
2534Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2535 2517
2536The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2538 2522
2539Will never block. 2523Will never block.
2540 2524
2541=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2542 2526
2594 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2596 2580
2597 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2600 2584
2601 $map->load; 2585 $map->load;
2602 $map->load_neighbours; 2586 $map->load_neighbours;
2603 2587
2604 return unless $self->contr->active; 2588 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2589
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2609} 2595}
2610 2596
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2598
2613Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2772 $self->contr->savebed ($map, $x, $y) 2758 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2759 if $exit->flag (cf::FLAG_DAMNED);
2774 2760
2775 1 2761 1
2776 }) { 2762 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2767
2782 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2812 2798
2813=cut 2799=cut
2814 2800
2815# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2817 "c/identify" => { 2809 "c/identify" => {
2818 id => "infobox", 2810 id => "infobox",
2819 title => "Identify", 2811 title => "Identify",
2820 reply => undef, 2812 reply => undef,
2821 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2823 "c/examine" => { 2815 "c/examine" => {
2824 id => "infobox", 2816 id => "infobox",
2825 title => "Examine", 2817 title => "Examine",
2826 reply => undef, 2818 reply => undef,
2827 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2826 },
2829 "c/book" => { 2827 "c/book" => {
2830 id => "infobox", 2828 id => "infobox",
2831 title => "Book", 2829 title => "Book",
2832 reply => undef, 2830 reply => undef,
2848 id => "infobox", 2846 id => "infobox",
2849 title => "Body Parts", 2847 title => "Body Parts",
2850 reply => undef, 2848 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2852 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2857 "c/skills" => {
2858 id => "infobox",
2859 title => "Skills",
2860 reply => undef,
2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2886 },
2853 "c/uptime" => { 2887 "c/uptime" => {
2854 id => "infobox", 2888 id => "infobox",
2855 title => "Uptime", 2889 title => "Uptime",
2856 reply => undef, 2890 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2866 id => "party", 2900 id => "party",
2867 title => "Party", 2901 title => "Party",
2868 reply => "gsay ", 2902 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2903 tooltip => "Messages and chat related to your party",
2870 }, 2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2871); 2913);
2872 2914
2873sub cf::client::send_msg { 2915sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2917
2876 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2877 2920
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2922
2880 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2883 2926
2884 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2888 2929
2889 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 2935 }
2896 2936
2897 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2898 } 2938 }
2899 2939
2900 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2901 2941
2902 if ($self->can_msg) {
2903 # default colour, mask it out 2942 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2906 2945
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 2949 );
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 2950
2921 $color &= cf::NDI_COLOR_MASK; 2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2922 2954
2923 utf8::encode $msg; 2955 # split very large packets
2924 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2925 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2926 # COMMAND/INFO 2958 $pkt = "frag";
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 } 2959 }
2960
2961 $self->send_packet ($pkt);
2934} 2962}
2935 2963
2936=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2937 2965
2938Sends an ext event to the client. 2966Sends an ext event to the client.
3113The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3114 3142
3115 cf::object 3143 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3145 insert remove name archname title slaying race decrease split
3146 value
3118 3147
3119 cf::object::player 3148 cf::object::player
3120 player 3149 player
3121 3150
3122 cf::player 3151 cf::player
3128=cut 3157=cut
3129 3158
3130for ( 3159for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["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 3161 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3137) { 3166) {
3138 no strict 'refs'; 3167 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3157 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3158 3187
3159 my $qcode = $code; 3188 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3162 3193
3163 local $_; 3194 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3165 3196
3166 my $eval = 3197 my $eval =
3396 reload_treasures; 3427 reload_treasures;
3397 3428
3398 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3399} 3430}
3400 3431
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3436 or return;
3412 3437
3413 local $/; 3438 local $/;
3414 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3415 3440
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3417 3442
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $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}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3450 };
3426 warn $@ if $@; 3451 warn $@ if $@;
3427 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3455}
3456
3457sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!";
3460 flock $fh, &Fcntl::LOCK_EX
3461 or die "$PIDFILE: flock: $!";
3462 $fh
3463}
3464
3465# make sure only one server instance is running at any one time
3466sub atomic {
3467 my $fh = pidfile;
3468
3469 my $pid = <$fh>;
3470 kill 9, $pid if $pid > 0;
3471
3472 seek $fh, 0, 0;
3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3428} 3483}
3429 3484
3430sub main { 3485sub main {
3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499
3431 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3503 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3438 }; 3507 };
3439 3508
3440 { 3509 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3510
3511 cf::sync_job {
3512 reload_resources;
3442 reload_config; 3513 reload_config;
3443 db_init; 3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3444 load_extensions; 3527 load_extensions;
3445 3528
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3529 utime time, time, $RUNTIMEFILE;
3530
3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534
3535 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3536 };
3448 3537
3449 EV::loop; 3538 main_loop;
3450} 3539}
3451 3540
3452############################################################################# 3541#############################################################################
3453# initialisation and cleanup 3542# initialisation and cleanup
3454 3543
3461 }; 3550 };
3462 } 3551 }
3463} 3552}
3464 3553
3465sub write_runtime_sync { 3554sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3470 3557
3471 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3559
3473 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3474 3561
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3563 or return;
3477 3564
3478 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3491 3578
3492 close $fh 3579 close $fh
3493 or return; 3580 or return;
3494 3581
3495 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3583 and return;
3497 3584
3498 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3499 3586
3500 1 3587 1
3512 my $uuid = "$LOCALDIR/uuid"; 3599 my $uuid = "$LOCALDIR/uuid";
3513 3600
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3602 or return;
3516 3603
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3612 $uuid_skip = 0;
3519 3613
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3615 and return;
3522 3616
3544} 3638}
3545 3639
3546sub emergency_save() { 3640sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3548 3642
3549 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3550 3644
3551 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3552 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3657 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3659 $pl->save;
3561 } 3660 }
3562 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3563 3662
3564 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3666 $map->valid or next;
3568 $map->save; 3667 $map->save;
3569 } 3668 }
3570 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3571 3670
3572 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3575 3674
3576 warn "begin write uuid\n"; 3675 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3676 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3677 warn "emergency_perl_save: end write uuid\n";
3579 }; 3678 };
3580 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3581 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3582} 3686}
3583 3687
3584sub post_cleanup { 3688sub post_cleanup {
3585 my ($make_core) = @_; 3689 my ($make_core) = @_;
3586 3690
3587 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3692 if $make_core;
3693
3694 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$;
3696}
3697
3698# a safer delete_package, copied from Symbol
3699sub clear_package($) {
3700 my $pkg = shift;
3701
3702 # expand to full symbol table name if needed
3703 unless ($pkg =~ /^main::.*::$/) {
3704 $pkg = "main$pkg" if $pkg =~ /^::/;
3705 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3706 $pkg .= '::' unless $pkg =~ /::$/;
3707 }
3708
3709 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3710 my $stem_symtab = *{$stem}{HASH};
3711
3712 defined $stem_symtab and exists $stem_symtab->{$leaf}
3713 or return;
3714
3715 # clear all symbols
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 }
3721 warn "cleared package $pkg\n";#d#
3589} 3722}
3590 3723
3591sub do_reload_perl() { 3724sub do_reload_perl() {
3592 # can/must only be called in main 3725 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3595 return; 3728 return;
3596 } 3729 }
3597 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3598 warn "reloading..."; 3736 warn "reloading...";
3599 3737
3600 warn "entering sync_job"; 3738 warn "entering sync_job";
3601 3739
3602 cf::sync_job { 3740 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3742 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3606 3744
3607 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3747
3610 # if anything goes wrong in here, we should simply crash as we already saved 3748 # if anything goes wrong in here, we should simply crash as we already saved
3611 3749
3612 warn "flushing outstanding aio requests"; 3750 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; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3752 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 } 3753 }
3644 3754
3645 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3647 } 3757 %EXT_CORO = ();
3648 3758
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3769
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3660 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3661 } 3779 }
3662 3780
3663 Symbol::delete_package $k; 3781 warn "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784
3785 warn "... unloading $k";
3786 delete $INC{$k};
3787
3788 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g;
3790
3791 if (my $cb = $k->can ("unload_module")) {
3792 $cb->();
3793 }
3794
3795 clear_package $k;
3664 } 3796 }
3665 3797
3666 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3801
3670 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3805
3674 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3807 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3677 3809
3678 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3679 3811
3680 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3681 require cf; 3813 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3683 3815
3684 warn "loading config and database again"; 3816 warn "loading config and database again";
3685 cf::reload_config; 3817 cf::reload_config;
3686 3818
3687 warn "loading extensions"; 3819 warn "loading extensions";
3688 cf::load_extensions; 3820 cf::load_extensions;
3689 3821
3822 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3696 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3697 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3698 3835
3699 1 3836 1
3700 } or do { 3837 } or do {
3701 warn $@; 3838 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3703 }; 3840 };
3704 3841
3705 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3706}; 3848};
3707 3849
3708our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3709 3851
3710sub reload_perl() { 3852sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3713 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3860 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3862 };
3717 }; 3863 };
3718} 3864}
3719 3865
3720register_command "reload" => sub { 3866register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3847 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3848 3994
3849 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3852 async { 3999 async {
3853 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3854 4001
3855 my @bt = fork_call { 4002 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3867 } 4014 }
3868 4015
3869 @funcs 4016 @funcs
3870 }; 4017 };
3871 4018
3872 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4022 --$_log_backtrace;
3875 }; 4023 };
3876 } else { 4024 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4027 }
3880} 4028}
3881 4029
3882# load additional modules 4030# load additional modules
3883use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3884 4033
3885END { cf::emergency_save } 4034END { cf::emergency_save }
3886 4035
38871 40361
3888 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines