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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 76
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 79
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 81
48our %COMMAND = (); 82our %COMMAND = ();
49our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
52our %EXTCMD = (); 86our %EXTCMD = ();
53our %EXTICMD = (); 87our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
56 90
57our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
59 95
60our $CONFDIR = confdir; 96our $CONFDIR = confdir;
61our $DATADIR = datadir; 97our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
71our %RESOURCE; 110our %RESOURCE;
72 111
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 114our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
79 116
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
85 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
90our $NOW; 128our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 136
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
102 146
103binmode STDOUT; 147binmode STDOUT;
104binmode STDERR; 148binmode STDERR;
105 149
106# read virtual server time, if available 150# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
111} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
112 158
113mkdir $_ 159mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 161
116our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
117 163
118sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
119 176
120############################################################################# 177#############################################################################
121 178
122=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
123 180
174 231
175This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 234that call.
178 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
179=back 242=back
180 243
181=cut 244=cut
182 245
183BEGIN { 246$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 247 my $msg = join "", @_;
186 248
187 $msg .= "\n" 249 $msg .= "\n"
188 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
189 251
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 253
192 LOG llevError, $msg; 254 LOG llevError, $msg;
193 }; 255};
194}
195 256
196$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
198 261
199 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 264 return;#d#
202 }#d# 265 }#d#
203 266
204 # kill coroutine otherwise 267 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 268 Coro::terminate
207}; 269};
208
209$SIG{__DIE__} = sub { }; #d#?
210 270
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 281for my $pkg (qw(
222 cf::global cf::attachable 282 cf::global cf::attachable
223 cf::object cf::object::player 283 cf::object cf::object::player
224 cf::client cf::player 284 cf::client cf::player
225 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
226 cf::map cf::party cf::region 287 cf::party cf::region
227)) { 288)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 290}
231 291
232$EV::DIED = sub { 292$EV::DIED = sub {
233 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 336
277sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
279 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
280=item cf::lock_wait $string 354=item cf::lock_wait $string
281 355
282Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
283 357
284=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
285 359
286Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
287a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
288for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
289returned. 363returned.
290 364
291Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro. 366deadlocked coro.
298 372
299Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
300 374
301=cut 375=cut
302 376
303our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 378
306sub lock_wait($) { 379sub lock_wait($) {
307 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 381}
320 382
321sub lock_acquire($) { 383sub lock_acquire($) {
322 my ($key) = @_; 384 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 385}
336 386
337sub lock_active($) { 387sub lock_active($) {
338 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 389}
342 390
343sub freeze_mainloop { 391sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
345 393
346 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 395}
352 396
353=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
354 398
355Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
410 } 454 }
411 } 455 }
412}; 456};
413 457
414sub get_slot($;$$) { 458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
415 my ($time, $pri, $name) = @_; 461 my ($time, $pri, $name) = @_;
416 462
417 $time = $TICK * .6 if $time > $TICK * .6; 463 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 464 my $sig = new Coro::Signal;
419 465
456 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
458 504
459 LOG llevError, Carp::longmess "sync job";#d# 505 LOG llevError, Carp::longmess "sync job";#d#
460 506
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
464 508
465 my $busy = 1; 509 my $busy = 1;
466 my @res; 510 my @res;
467 511
478 } else { 522 } else {
479 EV::loop EV::LOOP_ONESHOT; 523 EV::loop EV::LOOP_ONESHOT;
480 } 524 }
481 } 525 }
482 526
483 $time = EV::time - $time; 527 my $time = EV::time - $time;
484 528
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 529 $TICK_START += $time; # do not account sync jobs to server load
489 530
490 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
491 } else { 532 } else {
492 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
493 534
535 reset_signals; 576 reset_signals;
536 &$cb 577 &$cb
537 }, @args; 578 }, @args;
538 579
539 wantarray ? @res : $res[-1] 580 wantarray ? @res : $res[-1]
581}
582
583=item $coin = coin_from_name $name
584
585=cut
586
587our %coin_alias = (
588 "silver" => "silvercoin",
589 "silvercoin" => "silvercoin",
590 "silvercoins" => "silvercoin",
591 "gold" => "goldcoin",
592 "goldcoin" => "goldcoin",
593 "goldcoins" => "goldcoin",
594 "platinum" => "platinacoin",
595 "platinumcoin" => "platinacoin",
596 "platinumcoins" => "platinacoin",
597 "platina" => "platinacoin",
598 "platinacoin" => "platinacoin",
599 "platinacoins" => "platinacoin",
600 "royalty" => "royalty",
601 "royalties" => "royalty",
602);
603
604sub coin_from_name($) {
605 $coin_alias{$_[0]}
606 ? cf::arch::find $coin_alias{$_[0]}
607 : undef
540} 608}
541 609
542=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
543 611
544Returns a single value from the environment database. 612Returns a single value from the environment database.
683 751
684############################################################################# 752#############################################################################
685 753
686=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
687 755
688Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
691 759
692In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
744 812
745Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
747 815
748Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
750 818
751These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
752 820
753=over 4 821=over 4
1044 1112
1045sub reattach { 1113sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1115 my ($obj) = @_;
1048 1116
1117 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1119
1051 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1052 1121
1053 @$registry = (); 1122 @$registry = ();
1054 1123
1100 utf8::decode (my $decname = $filename); 1169 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1103 1172
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1108 close $fh; 1180 aio_close $fh;
1109 1181
1110 if (@$objs) { 1182 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1116 close $fh; 1191 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1193 }
1119 } else { 1194 } else {
1120 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1121 } 1196 }
1122 1197
1123 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1202 } else {
1125 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1126 } 1204 }
1127 } else { 1205 } else {
1128 aio_unlink $filename; 1206 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1130 } 1208 }
1221 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1222 1300
1223 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1224} 1302}
1225 1303
1304use File::Glob ();
1305
1226cf::player->attach ( 1306cf::player->attach (
1227 on_command => sub { 1307 on_command => sub {
1228 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1229 1309
1230 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
1262 1342
1263 cf::override; 1343 cf::override;
1264 }, 1344 },
1265); 1345);
1266 1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1359
1267sub load_extensions { 1360sub load_extensions {
1268 cf::sync_job { 1361 cf::sync_job {
1269 my %todo; 1362 my %todo;
1270 1363
1271 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
1290 1383
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1386
1294 $ext{source} = 1387 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1297 . $source 1390 . $source
1298 . "\n};\n1"; 1391 . "\n};\n1";
1299 1392
1300 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
1316 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1318 1411
1319 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1413 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1415 }
1324 1416
1325 warn $msg; 1417 warn $msg;
1326 } 1418 }
1327 1419
1341 1433
1342=back 1434=back
1343 1435
1344=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1345 1437
1346Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1347 1439
1348=cut 1440=cut
1349 1441
1350package cf::player; 1442package cf::player;
1351 1443
1394 1486
1395sub exists($) { 1487sub exists($) {
1396 my ($login) = @_; 1488 my ($login) = @_;
1397 1489
1398 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1400} 1492}
1401 1493
1402sub find($) { 1494sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1496 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1508 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1509 or return;
1418 1510
1419 my $pl = cf::player::load_pl $f 1511 my $pl = cf::player::load_pl $f
1420 or return; 1512 or return;
1513
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1514 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1515 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1424 } 1517 }
1425 } 1518 }
1435 1528
1436 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1437 1530
1438 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1533
1534 cf::get_slot 0.01;
1440 1535
1441 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1537 cf::cede_to_tick;
1443} 1538}
1444 1539
1476 my ($pl) = @_; 1571 my ($pl) = @_;
1477 1572
1478 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1479 1574
1480 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1482 1577
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1487 1584
1488 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 1625
1529 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1530 my $path = path $login; 1627 my $path = path $login;
1531 1628
1532 # a .pst is a dead give-away for a valid player 1629 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1635 }
1538 1636
1569 } 1667 }
1570 1668
1571 \@paths 1669 \@paths
1572} 1670}
1573 1671
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1673
1576Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666 1675
1667=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1668 1677
1669Sends an ext reply to the player. 1678Sends an ext reply to the player.
1670 1679
1737our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1739 1748
1740sub generate_random_map { 1749sub generate_random_map {
1741 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1742 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1755 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1868 1880
1869# the temporary/swap location 1881# the temporary/swap location
1870sub save_path { 1882sub save_path {
1871 my ($self) = @_; 1883 my ($self) = @_;
1872 1884
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1875} 1887}
1876 1888
1877# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1878sub uniq_path { 1890sub uniq_path {
1879 my ($self) = @_; 1891 my ($self) = @_;
1880 1892
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1883}
1884
1885# and all this just because we cannot iterate over
1886# all maps in C++...
1887sub change_all_map_light {
1888 my ($change) = @_;
1889
1890 $_->change_map_light ($change)
1891 for grep $_->outdoor, values %cf::MAP;
1892} 1895}
1893 1896
1894sub decay_objects { 1897sub decay_objects {
1895 my ($self) = @_; 1898 my ($self) = @_;
1896 1899
1980sub find { 1983sub find {
1981 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1982 1985
1983 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1984 1987
1985 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1987 1990
1988 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1992 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1993 or return; 1993 or return;
1994 1994
1995 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1996 1996
1998 or return; 1998 or return;
1999 1999
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2003 undef $guard1; 2004 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2005 $map->reset;
2006 return find $path; 2006 return find $path;
2007 } 2007 }
2008 2008
2009 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2037 $f->skip_block;
2038 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2039 or return; 2039 or return;
2040 2040
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2042 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2043 2043
2044 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2045 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2064 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2065 $self->decay_objects;
2066 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2067 $self->update_buttons; 2067 $self->update_buttons;
2068 cf::cede_to_tick; 2068 cf::cede_to_tick;
2069 $self->set_darkness_map;
2070 cf::cede_to_tick;
2071 $self->activate; 2069 $self->activate;
2072 } 2070 }
2073 2071
2074 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2076 2074
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2076 }
2079 2077
2080 $self->post_load; 2078 $self->post_load;
2081} 2079}
2082 2080
2140 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2141 2139
2142 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2143 2141
2144 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2144 }
2147 2145
2148 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2149 2147
2150 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2187 cf::async { 2185 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2190 }; 2188 };
2191 2189
2190 cf::get_slot 0.02;
2191
2192 if ($uniq) { 2192 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2195 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2204 $self->save; 2204 $self->save;
2205 2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2207
2208 return if $self->players; 2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2211 2211
2212 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2213 2213
2214 $self->deactivate; 2214 $self->deactivate;
2239 2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241 2241
2242 return if $self->players; 2242 return if $self->players;
2243 2243
2244 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2245 2245
2246 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2247 2247
2248 # need to save uniques path 2248 # need to save uniques path
2249 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2332 2332
2333sub unique_maps() { 2333sub unique_maps() {
2334 [ 2334 [
2335 map { 2335 map {
2336 utf8::decode $_; 2336 utf8::decode $_;
2337 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2338 ? normalise $_ 2340 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2342 ]
2342} 2343}
2343 2344
2344package cf;
2345
2346=back 2345=back
2347 2346
2348=head3 cf::object 2347=head3 cf::object
2349 2348
2350=cut 2349=cut
2353 2352
2354=over 4 2353=over 4
2355 2354
2356=item $ob->inv_recursive 2355=item $ob->inv_recursive
2357 2356
2358Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
2359 2359
2360=cut 2360=cut
2361 2361
2362sub inv_recursive_; 2362sub inv_recursive_;
2363sub inv_recursive_ { 2363sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2369} 2369}
2370 2370
2371=item $ref = $ob->ref 2371=item $ref = $ob->ref
2372 2372
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2373Creates and returns a persistent reference to an object that can be stored as a string.
2374 2374
2375=item $ob = cf::object::deref ($refstring) 2375=item $ob = cf::object::deref ($refstring)
2376 2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2378even if the object actually exists. May block.
2410can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2411dialogue with the given NPC character.
2412 2412
2413=cut 2413=cut
2414 2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
2428
2415# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2430# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2446
2433 } else { 2447 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2450 }
2437 } 2451 }
2438} 2452}
2439 2453
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2479
2466=item $player_object->enter_link 2480=item $player_object->enter_link
2467 2481
2468Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2469 2483
2470The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2471I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2472 2488
2473Will never block. 2489Will never block.
2474 2490
2475=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2476 2492
2534 2550
2535 $map->load; 2551 $map->load;
2536 $map->load_neighbours; 2552 $map->load_neighbours;
2537 2553
2538 return unless $self->contr->active; 2554 return unless $self->contr->active;
2539 $self->activate_recursive;
2540 2555
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2543} 2561}
2544 2562
2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2546 2564
2547Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2548her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2549that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2550the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process. 2569be called at the end of this process.
2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2552 2573
2553=cut 2574=cut
2554 2575
2555our $GOTOGEN; 2576our $GOTOGEN;
2556 2577
2635} 2656}
2636 2657
2637sub prepare_random_map { 2658sub prepare_random_map {
2638 my ($exit) = @_; 2659 my ($exit) = @_;
2639 2660
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2663 # that depends on the exit object
2645 2664
2646 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2667 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2653 } 2674 }
2654 2675
2655 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2656 2677
2657 my $data = cf::encode_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2660 2681
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2684 undef $fh;
2664 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2665 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2668 } 2693 }
2669} 2694}
2670 2695
2671sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2673 2698
2674 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2675 2700
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2701 $self->enter_link;
2688 2702
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2703 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2695 2705
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2698 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2699 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2700 1; 2727 1
2701 }) { 2728 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2733
2707 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2773 id => "infobox", 2800 id => "infobox",
2774 title => "Body Parts", 2801 title => "Body Parts",
2775 reply => undef, 2802 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2777 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2778 "c/uptime" => { 2841 "c/uptime" => {
2779 id => "infobox", 2842 id => "infobox",
2780 title => "Uptime", 2843 title => "Uptime",
2781 reply => undef, 2844 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 2848 id => "infobox",
2786 title => "Map Info", 2849 title => "Map Info",
2787 reply => undef, 2850 reply => undef,
2788 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2789 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2790); 2867);
2791 2868
2792sub cf::client::send_msg { 2869sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2871
2795 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2796 2874
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 2876
2799 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2802 2880
2803 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2807 2883
2808 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2813 if $self->can_msg;
2814 } 2889 }
2815 2890
2816 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2817 } 2892 }
2818 2893
2819 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2820 2895
2821 if ($self->can_msg) {
2822 # default colour, mask it out 2896 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2825 2899
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2828 } else { 2903 );
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839 2904
2840 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2841 2908
2842 utf8::encode $msg; 2909 # split very large packets
2843 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2844 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2845 # COMMAND/INFO 2912 $pkt = "frag";
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 } 2913 }
2914
2915 $self->send_packet ($pkt);
2853} 2916}
2854 2917
2855=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2856 2919
2857Sends an ext event to the client. 2920Sends an ext event to the client.
3031 3094
3032The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3033 3096
3034 cf::object 3097 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3037 3101
3038 cf::object::player 3102 cf::object::player
3039 player 3103 player
3040 3104
3041 cf::player 3105 cf::player
3046 3110
3047=cut 3111=cut
3048 3112
3049for ( 3113for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3053 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3055 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3056) { 3120) {
3057 no strict 'refs'; 3121 no strict 'refs';
3058 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3059 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3077 3141
3078 my $qcode = $code; 3142 my $qcode = $code;
3079 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3080 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3081 3147
3082 local $_; 3148 local $_;
3083 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3084 3150
3085 my $eval = 3151 my $eval =
3265 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3267 } 3333 }
3268}; 3334};
3269 3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
3270sub reload_regions { 3346sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3347 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3348 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3350
3287} 3363}
3288 3364
3289sub reload_archetypes { 3365sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3368}
3298 3369
3299sub reload_treasures { 3370sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3302} 3373}
3303 3374
3304sub reload_resources { 3375sub reload_resources {
3305 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3306 3377
3378 reload_facedata;
3379 reload_archetypes;
3307 reload_regions; 3380 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3381 reload_treasures;
3312 3382
3313 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3384}
3319 3385
3320sub reload_config { 3386sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3322 or return; 3388 or return;
3336 }; 3402 };
3337 warn $@ if $@; 3403 warn $@ if $@;
3338 } 3404 }
3339} 3405}
3340 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3341sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3342 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3345 (async { 3453 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3349 }; 3457 };
3350 3458
3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3351 reload_config; 3463 reload_config;
3352 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3353 load_extensions; 3477 load_extensions;
3354 3478
3355 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3480
3357 EV::loop; 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3358} 3489}
3359 3490
3360############################################################################# 3491#############################################################################
3361# initialisation and cleanup 3492# initialisation and cleanup
3362 3493
3368 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
3369 }; 3500 };
3370 } 3501 }
3371} 3502}
3372 3503
3373sub write_runtime { 3504sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime";
3375
3376 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3378 3507
3379 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3509
3381 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3382 3511
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3384 or return; 3513 or return;
3385 3514
3386 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3399 3528
3400 close $fh 3529 close $fh
3401 or return; 3530 or return;
3402 3531
3403 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3533 and return;
3405 3534
3406 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3407 3536
3408 1 3537 1
3538}
3539
3540our $uuid_lock;
3541our $uuid_skip;
3542
3543sub write_uuid_sync($) {
3544 $uuid_skip ||= $_[0];
3545
3546 return if $uuid_lock;
3547 local $uuid_lock = 1;
3548
3549 my $uuid = "$LOCALDIR/uuid";
3550
3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3552 or return;
3553
3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0;
3563
3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3565 and return;
3566
3567 # always fsync - this file is important
3568 aio_fsync $fh
3569 and return;
3570
3571 close $fh
3572 or return;
3573
3574 aio_rename "$uuid~", $uuid
3575 and return;
3576
3577 warn "uuid file written ($value).\n";
3578
3579 1
3580
3581}
3582
3583sub write_uuid($$) {
3584 my ($skip, $sync) = @_;
3585
3586 $sync ? write_uuid_sync $skip
3587 : async { write_uuid_sync $skip };
3409} 3588}
3410 3589
3411sub emergency_save() { 3590sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3413 3592
3414 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3415 3594
3416 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3417 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3418 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3419 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3420 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3421 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3422 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3423 $pl->valid or next; 3607 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3425 $pl->save; 3609 $pl->save;
3426 } 3610 }
3427 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3428 3612
3429 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3430 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3431 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3432 $map->valid or next; 3616 $map->valid or next;
3433 $map->save; 3617 $map->save;
3434 } 3618 }
3435 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3436 3620
3437 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3624
3625 warn "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n";
3440 }; 3628 };
3441 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3442 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3443} 3636}
3444 3637
3445sub post_cleanup { 3638sub post_cleanup {
3446 my ($make_core) = @_; 3639 my ($make_core) = @_;
3447 3640
3448 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
3450} 3672}
3451 3673
3452sub do_reload_perl() { 3674sub do_reload_perl() {
3453 # can/must only be called in main 3675 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3455 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3456 return; 3678 return;
3457 } 3679 }
3458 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3459 warn "reloading..."; 3686 warn "reloading...";
3460 3687
3461 warn "entering sync_job"; 3688 warn "entering sync_job";
3462 3689
3463 cf::sync_job { 3690 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3692 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3467 3694
3468 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3697
3471 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
3472 3699
3473 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3479 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = ();
3487
3488 warn "removing commands";
3489 %COMMAND = ();
3490
3491 warn "removing ext/exti commands";
3492 %EXTCMD = ();
3493 %EXTICMD = ();
3494
3495 warn "unloading/nuking all extensions";
3496 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg";
3498
3499 if (my $cb = $pkg->can ("unload")) {
3500 eval {
3501 $cb->($pkg);
3502 1
3503 } or warn "$pkg unloaded, but with errors: $@";
3504 } 3703 }
3505 3704
3506 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3507 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3508 } 3707 %EXT_CORO = ();
3509 3708
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3511 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3514 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3515 delete $INC{$k};
3516 3719
3517 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g;
3519
3520 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3521 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3522 } 3729 }
3523 3730
3524 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3525 } 3746 }
3526 3747
3527 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3529 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3530 3751
3531 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3534 3755
3535 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3757 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3538 3759
3539 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3540 3761
3541 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3542 require cf; 3763 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3544 3765
3545 warn "loading config and database again"; 3766 warn "loading config and database again";
3546 cf::reload_config; 3767 cf::reload_config;
3547 3768
3548 warn "loading extensions"; 3769 warn "loading extensions";
3549 cf::load_extensions; 3770 cf::load_extensions;
3550 3771
3772 if ($REATTACH_ON_RELOAD) {
3551 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3557 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3558 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3559 3785
3560 1 3786 1
3561 } or do { 3787 } or do {
3562 warn $@; 3788 warn $@;
3563 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3790 };
3566 3791
3567 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3568}; 3798};
3569 3799
3570our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3571 3801
3572sub reload_perl() { 3802sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3575 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 3810 do_reload_perl;
3578 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3579 }; 3813 };
3580} 3814}
3581 3815
3582register_command "reload" => sub { 3816register_command "reload" => sub {
3583 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3597 3831
3598our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3600 3834
3601sub wait_for_tick { 3835sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3837
3605 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3840 $signal->wait;
3608} 3841}
3609 3842
3610sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3845
3614 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3848 $signal->wait;
3617} 3849}
3618 3850
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3851sub tick {
3620 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3623 return; 3855 return;
3624 } 3856 }
3625 3857
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3859
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3862 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3863 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3864 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3865 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3866 };
3640 } 3867 }
3641 3868
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3644 } 3871 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3873 $sig->send;
3647 } 3874 }
3648 3875
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3878
3652 _post_tick; 3879 if (0) {
3653}; 3880 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
3885 }
3886}
3655 3887
3656{ 3888{
3657 # configure BDB 3889 # configure BDB
3658 3890
3659 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3662 3894
3663 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | BDB::LOG_AUTOREMOVE, 1); 3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3902
3670 cf::sync_job { 3903 cf::sync_job {
3671 eval { 3904 eval {
3697{ 3930{
3698 # configure IO::AIO 3931 # configure IO::AIO
3699 3932
3700 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3935 undef $AnyEvent::AIO::WATCHER;
3703} 3936}
3704 3937
3705my $_log_backtrace; 3938my $_log_backtrace;
3706 3939
3707sub _log_backtrace { 3940sub _log_backtrace {
3710 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3711 3944
3712 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3714 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3715 async { 3949 async {
3716 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3717 3951
3718 my @bt = fork_call { 3952 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3730 } 3964 }
3731 3965
3732 @funcs 3966 @funcs
3733 }; 3967 };
3734 3968
3735 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 3972 --$_log_backtrace;
3738 }; 3973 };
3739 } else { 3974 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3741 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3742 } 3977 }
3743} 3978}
3744 3979
3745# load additional modules 3980# load additional modules
3746use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3747 3982
3748END { cf::emergency_save } 3983END { cf::emergency_save }
3749 3984
37501 39851
3751 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines