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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines