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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 143our @POST_INIT;
134 144
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
136 147
137binmode STDOUT; 148binmode STDOUT;
138binmode STDERR; 149binmode STDERR;
139 150
140# read virtual server time, if available 151# read virtual server time, if available
… …
142 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
145} 156}
146 157
158eval "sub TICK() { $TICK } 1" or die;
159
147mkdir $_ 160mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 162
150our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
151 164
152sub 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::"} };
153 177
154############################################################################# 178#############################################################################
155 179
156=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
157 181
… …
204returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
205per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206 230
207=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
208 232
209This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 235that call.
212 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
213=back 243=back
214 244
215=cut 245=cut
216 246
217BEGIN { 247$Coro::State::WARNHOOK = sub {
218 *CORE::GLOBAL::warn = sub {
219 my $msg = join "", @_; 248 my $msg = join "", @_;
220 249
221 $msg .= "\n" 250 $msg .= "\n"
222 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
223 252
224 $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;
225 254
226 LOG llevError, $msg; 255 LOG llevError, $msg;
227 }; 256};
228}
229 257
230$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
232 262
233 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 265 return;#d#
236 }#d# 266 }#d#
237 267
238 # kill coroutine otherwise 268 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 269 Coro::terminate
241}; 270};
242
243$SIG{__DIE__} = sub { }; #d#?
244 271
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
262)) { 289)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 291}
265 292
266$EV::DIED = sub { 293$EV::DIED = sub {
267 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
268}; 295};
269 296
270############################################################################# 297#############################################################################
271 298
272=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
330Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
331 358
332=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
333 360
334Wait 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
335a 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,
336for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
337returned. 364returned.
338 365
339Locks 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
340deadlocked coro. 367deadlocked coro.
… …
346 373
347Return 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.
348 375
349=cut 376=cut
350 377
351our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 379
354sub lock_wait($) { 380sub lock_wait($) {
355 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 382}
369 383
370sub lock_acquire($) { 384sub lock_acquire($) {
371 my ($key) = @_; 385 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 386}
385 387
386sub lock_active($) { 388sub lock_active($) {
387 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 390}
391 391
392sub freeze_mainloop { 392sub freeze_mainloop {
393 tick_inhibit_inc; 393 tick_inhibit_inc;
394 394
395 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
396} 396}
397 397
398=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
399 399
400Like 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
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
496 503
497sub sync_job(&) { 504sub sync_job(&) {
498 my ($job) = @_; 505 my ($job) = @_;
499 506
500 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 508 my $time = AE::time;
502 509
503 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
505 512
506 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 530 } else {
524 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
525 } 532 }
526 } 533 }
527 534
528 my $time = EV::time - $time; 535 my $time = AE::time - $time;
529 536
530 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
531 538
532 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
533 } else { 540 } else {
… …
1172 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1173 1180
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1178 aio_close $fh; 1188 aio_close $fh;
1179 1189
1180 if (@$objs) { 1190 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
1186 aio_close $fh; 1199 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1201 }
1189 } else { 1202 } else {
1190 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
… …
1193 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1194 1207
1195 $filename =~ s%/[^/]+$%%; 1208 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1209 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1210 } else {
1198 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1199 } 1212 }
1200 } else { 1213 } else {
1201 aio_unlink $filename; 1214 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1203 } 1216 }
… …
1297} 1310}
1298 1311
1299use File::Glob (); 1312use File::Glob ();
1300 1313
1301cf::player->attach ( 1314cf::player->attach (
1302 on_command => sub { 1315 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1304 1317
1305 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1306 or return; 1319 or return;
1307 1320
… …
1341 1354
1342# "readahead" all extensions 1355# "readahead" all extensions
1343sub cache_extensions { 1356sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1357 my $grp = IO::AIO::aio_group;
1345 1358
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1360 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1362 }
1350 }; 1363 };
1351 1364
… …
1386 . "\n};\n1"; 1399 . "\n};\n1";
1387 1400
1388 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1389 } 1402 }
1390 1403
1404 my $pass = 0;
1391 my %done; 1405 my %done;
1392 while (%todo) { 1406 while (%todo) {
1393 my $progress; 1407 my $progress;
1394 1408
1409 ++$pass;
1410
1411 ext:
1395 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1414 next ext
1398 unless exists $done{$_}; 1415 unless exists $done{$_};
1399 } 1416 }
1400 1417
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1419
1403 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1424
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1426 if exists $v->{meta}{mandatory};
1411 1427 } else {
1412 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1413 } 1434 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1435 }
1419 1436
1420 skip: 1437 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1423 } 1445 }
1424 }; 1446 };
1425} 1447}
1426 1448
1427############################################################################# 1449#############################################################################
… …
1511 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1512 } 1534 }
1513 } 1535 }
1514} 1536}
1515 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1516sub save($) { 1551sub save($) {
1517 my ($pl) = @_; 1552 my ($pl) = @_;
1518 1553
1519 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1520 1555
… …
1525 1560
1526 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1528 1563
1529 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1530 1568
1531 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1570 cf::cede_to_tick;
1533} 1571}
1534 1572
… …
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748 1786
1749 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1788 $self->_create_random_map (
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1887 1925
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1890} 1928}
1891 1929
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 1930sub decay_objects {
1902 my ($self) = @_; 1931 my ($self) = @_;
1903 1932
1904 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1905 1934
… …
1987sub find { 2016sub find {
1988 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1989 2018
1990 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1991 2020
1992 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2023
1995 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
2000 or return; 2026 or return;
2001 2027
2002 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
2003 2029
… …
2015 2041
2016 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2017 } 2043 }
2018} 2044}
2019 2045
2020sub pre_load { } 2046sub pre_load { }
2021sub post_load { } 2047#sub post_load { } # XS
2022 2048
2023sub load { 2049sub load {
2024 my ($self) = @_; 2050 my ($self) = @_;
2025 2051
2026 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2071 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2098 $self->decay_objects;
2073 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2074 $self->update_buttons; 2100 $self->update_buttons;
2075 cf::cede_to_tick; 2101 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2102 $self->activate;
2079 } 2103 }
2080 2104
2081 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
… …
2085 } 2109 }
2086 2110
2087 $self->post_load; 2111 $self->post_load;
2088} 2112}
2089 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2090sub customise_for { 2117sub customise_for {
2091 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2092 2119
2093 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2121 if $self->per_player;
… …
2248 2275
2249 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250 2277
2251 return if $self->players; 2278 return if $self->players;
2252 2279
2253 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2254 2281
2255 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2256 2283
2257 # need to save uniques path 2284 # need to save uniques path
2258 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2349 : normalise $_ 2376 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2378 ]
2352} 2379}
2353 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2354=back 2413=back
2355 2414
2356=head3 cf::object 2415=head3 cf::object
2357 2416
2358=cut 2417=cut
… …
2423 2482
2424our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2425 id => "say", 2484 id => "say",
2426 title => "Map", 2485 title => "Map",
2427 reply => "say ", 2486 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2488};
2430 2489
2431our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2432 id => "chat", 2491 id => "chat",
2433 title => "Chat", 2492 title => "Chat",
… …
2553 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2555 2614
2556 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2559 2618
2560 $map->load; 2619 $map->load;
2561 $map->load_neighbours; 2620 $map->load_neighbours;
2562 2621
2563 return unless $self->contr->active; 2622 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2623
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2569} 2629}
2570 2630
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2572 2632
2573Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
… …
2761 2821
2762 utf8::encode $text; 2822 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2764} 2824}
2765 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2852
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2769client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2770the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2772 2857
2773=cut 2858=cut
2774 2859
2775# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2777 "c/identify" => { 2868 "c/identify" => {
2778 id => "infobox", 2869 id => "infobox",
2779 title => "Identify", 2870 title => "Identify",
2780 reply => undef, 2871 reply => undef,
2781 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2783 "c/examine" => { 2874 "c/examine" => {
2784 id => "infobox", 2875 id => "infobox",
2785 title => "Examine", 2876 title => "Examine",
2786 reply => undef, 2877 reply => undef,
2787 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2885 },
2789 "c/book" => { 2886 "c/book" => {
2790 id => "infobox", 2887 id => "infobox",
2791 title => "Book", 2888 title => "Book",
2792 reply => undef, 2889 reply => undef,
… …
2808 id => "infobox", 2905 id => "infobox",
2809 title => "Body Parts", 2906 title => "Body Parts",
2810 reply => undef, 2907 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2812 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2813 "c/skills" => { 2916 "c/skills" => {
2814 id => "infobox", 2917 id => "infobox",
2815 title => "Skills", 2918 title => "Skills",
2816 reply => undef, 2919 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2818 }, 2945 },
2819 "c/uptime" => { 2946 "c/uptime" => {
2820 id => "infobox", 2947 id => "infobox",
2821 title => "Uptime", 2948 title => "Uptime",
2822 reply => undef, 2949 reply => undef,
… …
2832 id => "party", 2959 id => "party",
2833 title => "Party", 2960 title => "Party",
2834 reply => "gsay ", 2961 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2836 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2837); 2972);
2838 2973
2839sub cf::client::send_msg { 2974sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2976
… …
2846 2981
2847 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2850 2985
2851 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2855 2988
2856 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 2994 }
2863 2995
2864 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2865 } 2997 }
2866 2998
2867 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2868 3000
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3001 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2873 3004
2874 my $pkt = "msg " 3005 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3008 );
2878 3009
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3011}
2916 3012
2917=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2918 3014
2919Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2922 3018
2923sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2925 3021
2926 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3027 }
2932} 3028}
2933 3029
2934=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2935 3031
… …
2939 3035
2940sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2942 3038
2943 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3042 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3045 }
2950} 3046}
2951 3047
2952=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2953 3049
… …
3054 3150
3055 $coro 3151 $coro
3056} 3152}
3057 3153
3058cf::client->attach ( 3154cf::client->attach (
3059 on_destroy => sub { 3155 on_client_destroy => sub {
3060 my ($ns) = @_; 3156 my ($ns) = @_;
3061 3157
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3159 },
3064); 3160);
… …
3080our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3081 3177
3082$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3083 3179
3084$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3087 sort time 3183 sort time
3088)); 3184));
3089 3185
3090# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3094The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3095 3191
3096 cf::object 3192 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3099 3196
3100 cf::object::player 3197 cf::object::player
3101 player 3198 player
3102 3199
3103 cf::player 3200 cf::player
… …
3109=cut 3206=cut
3110 3207
3111for ( 3208for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3118) { 3215) {
3119 no strict 'refs'; 3216 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 3236
3140 my $qcode = $code; 3237 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3143 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3144 local $_; 3244 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3245
3147 my $eval = 3246 my $eval =
3148 "do {\n" 3247 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3250 . $code
3152 . "\n}" 3251 . "\n}"
3153 ; 3252 ;
3154 3253
3254 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3158 3263
3159 if ($@) { 3264 if ($@) {
3160 warn "$@"; 3265 warn "$@";
3161 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3181=cut 3286=cut
3182 3287
3183sub register_script_function { 3288sub register_script_function {
3184 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3185 3290
3186 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3188} 3293}
3189 3294
3190=back 3295=back
3191 3296
3192=cut 3297=cut
… …
3213 3318
3214 $facedata->{version} == 2 3319 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3321
3217 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3325 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3221 }; 3328 };
3222 cf::cede_to_tick; 3329 cf::cede_to_tick;
3223 3330
3224 { 3331 {
3225 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3227 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3336
3230 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3341
3235 cf::cede_to_tick; 3342 cf::cede_to_tick;
3236 } 3343 }
3237 3344
3238 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3262 3369
3263 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3264 } 3371 }
3265 3372
3266 { 3373 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3270 3375
3271 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3379
3276 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3291 } else { 3382 } else {
3292 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3293 } 3384 }
3294 3385
… …
3378 3469
3379 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3380} 3471}
3381 3472
3382sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3477 or return;
3385 3478
3386 local $/; 3479 local $/;
3387 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3388 3481
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3390 3483
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3491 };
3399 warn $@ if $@; 3492 warn $@ if $@;
3400 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3401} 3496}
3402 3497
3403sub pidfile() { 3498sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3417 3512
3418 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3419 print $fh $$; 3514 print $fh $$;
3420} 3515}
3421 3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3524}
3525
3422sub main { 3526sub main {
3423 cf::init_globals; # initialise logging 3527 cf::init_globals; # initialise logging
3424 3528
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3429 3533
3430 cf::init_experience; 3534 cf::init_experience;
3431 cf::init_anim; 3535 cf::init_anim;
3432 cf::init_attackmess; 3536 cf::init_attackmess;
3433 cf::init_dynamic; 3537 cf::init_dynamic;
3434 cf::init_block;
3435 3538
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3540
3438 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
… …
3445 }; 3548 };
3446 3549
3447 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3448 3551
3449 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3450 reload_resources; 3556 reload_resources;
3451 reload_config; 3557 reload_config;
3452 db_init; 3558 db_init;
3453 3559
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3560 cf::init_uuid;
3457 cf::init_signals; 3561 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3562 cf::init_skills;
3460 3563
3461 cf::init_beforeplay; 3564 cf::init_beforeplay;
3462 3565
3463 atomic; 3566 atomic;
… …
3465 load_extensions; 3568 load_extensions;
3466 3569
3467 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3468 3571
3469 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3575
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3577 };
3474 3578
3475 EV::loop; 3579 main_loop;
3476} 3580}
3477 3581
3478############################################################################# 3582#############################################################################
3479# initialisation and cleanup 3583# initialisation and cleanup
3480 3584
3481# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3482BEGIN { 3586BEGIN {
3483 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3487 }; 3591 };
3488 } 3592 }
3489} 3593}
3490 3594
3491sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3492 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3494 3600
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3602
3497 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3498 3604
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3606 or return;
3501 3607
3502 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3517 or return; 3623 or return;
3518 3624
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3626 and return;
3521 3627
3522 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3629
3524 1 3630 1
3525} 3631}
3526 3632
3527our $uuid_lock; 3633our $uuid_lock;
… …
3665 return; 3771 return;
3666 } 3772 }
3667 3773
3668 return if $RELOAD++; 3774 return if $RELOAD++;
3669 3775
3670 my $t1 = EV::time; 3776 my $t1 = AE::time;
3671 3777
3672 while ($RELOAD) { 3778 while ($RELOAD) {
3673 warn "reloading..."; 3779 warn "reloading...";
3674 3780
3675 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3736 clear_package "safe::$_" 3842 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3844
3739 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3848
3743 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3850 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3746 3852
3747 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3748 3854
3749 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3750 require cf; 3856 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3752 3858
3753 warn "loading config and database again"; 3859 warn "loading config and database again";
3754 cf::reload_config; 3860 cf::reload_config;
3755 3861
3756 warn "loading extensions"; 3862 warn "loading extensions";
… …
3778 3884
3779 warn "reloaded"; 3885 warn "reloaded";
3780 --$RELOAD; 3886 --$RELOAD;
3781 } 3887 }
3782 3888
3783 $t1 = EV::time - $t1; 3889 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 3890 warn "reload completed in ${t1}s\n";
3785}; 3891};
3786 3892
3787our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3788 3894
… …
3791 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3792 3898
3793 $RELOAD_WATCHER ||= cf::async { 3899 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 3900 Coro::AIO::aio_wait cache_extensions;
3795 3901
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 3903 do_reload_perl;
3798 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3799 }; 3905 };
3800 }; 3906 };
3801} 3907}
… …
3818 3924
3819our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3821 3927
3822sub wait_for_tick { 3928sub wait_for_tick {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 3930
3825 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 3933 $signal->wait;
3828} 3934}
3829 3935
3830sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 3938
3833 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 3941 $signal->wait;
3836} 3942}
… …
3841 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3842 return; 3948 return;
3843 } 3949 }
3844 3950
3845 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3846 3954
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 3957 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3873} 3981}
3874 3982
3875{ 3983{
3876 # configure BDB 3984 # configure BDB
3877 3985
3878 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3881 3989
3882 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4072 }
3965} 4073}
3966 4074
3967# load additional modules 4075# load additional modules
3968use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3969 4078
3970END { cf::emergency_save } 4079END { cf::emergency_save }
3971 4080
39721 40811
3973 4082

Diff Legend

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