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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines