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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
35 37
38use Guard ();
36use Coro 4.50 (); 39use Coro ();
37use Coro::State; 40use Coro::State;
38use Coro::Handle; 41use Coro::Handle;
39use Coro::EV; 42use Coro::EV;
43use Coro::AnyEvent;
40use Coro::Timer; 44use Coro::Timer;
41use Coro::Signal; 45use Coro::Signal;
42use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
43use Coro::AIO; 49use Coro::AIO;
44use Coro::BDB; 50use Coro::BDB 1.6;
45use Coro::Storable; 51use Coro::Storable;
46use Coro::Util (); 52use Coro::Util ();
47 53
48use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
49use BDB (); 55use BDB ();
50use Data::Dumper; 56use Data::Dumper;
51use Digest::MD5; 57use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 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 :)
147
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub 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::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
191returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 230
194=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
195 232
196This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 235that call.
199 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
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $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;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
296our $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
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks 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
313deadlocked coro. 367deadlocked coro.
319 373
320Return 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.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like 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
427 } 455 }
428 } 456 }
429}; 457};
430 458
431sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
432 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
433 463
434 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
436 466
547 reset_signals; 577 reset_signals;
548 &$cb 578 &$cb
549 }, @args; 579 }, @args;
550 580
551 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
552} 609}
553 610
554=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
555 612
556Returns a single value from the environment database. 613Returns a single value from the environment database.
695 752
696############################################################################# 753#############################################################################
697 754
698=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
699 756
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
703 760
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
756 813
757Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
759 816
760Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 819
763These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
764 821
765=over 4 822=over 4
1056 1113
1057sub reattach { 1114sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1116 my ($obj) = @_;
1060 1117
1118 # no longer needed after getting rid of delete_package?
1061 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
1062 1120
1063 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1064 1122
1065 @$registry = (); 1123 @$registry = ();
1066 1124
1112 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1115 1173
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1181 aio_close $fh;
1121 1182
1122 if (@$objs) { 1183 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1192 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1194 }
1131 } else { 1195 } else {
1132 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1133 } 1197 }
1134 1198
1135 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1203 } else {
1137 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1138 } 1205 }
1139 } else { 1206 } else {
1140 aio_unlink $filename; 1207 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1142 } 1209 }
1233 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1234 1301
1235 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1236} 1303}
1237 1304
1305use File::Glob ();
1306
1238cf::player->attach ( 1307cf::player->attach (
1239 on_command => sub { 1308 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1241 1310
1242 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1274 1343
1275 cf::override; 1344 cf::override;
1276 }, 1345 },
1277); 1346);
1278 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
1279sub load_extensions { 1361sub load_extensions {
1280 cf::sync_job { 1362 cf::sync_job {
1281 my %todo; 1363 my %todo;
1282 1364
1283 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1302 1384
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1387
1306 $ext{source} = 1388 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1309 . $source 1391 . $source
1310 . "\n};\n1"; 1392 . "\n};\n1";
1311 1393
1312 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1352 1434
1353=back 1435=back
1354 1436
1355=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1356 1438
1357Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1358 1440
1359=cut 1441=cut
1360 1442
1361package cf::player; 1443package cf::player;
1362 1444
1405 1487
1406sub exists($) { 1488sub exists($) {
1407 my ($login) = @_; 1489 my ($login) = @_;
1408 1490
1409 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1411} 1493}
1412 1494
1413sub find($) { 1495sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1497 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1510 or return;
1429 1511
1430 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1431 or return; 1513 or return;
1514
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1435 } 1518 }
1436 } 1519 }
1446 1529
1447 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1448 1531
1449 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1451 1536
1452 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1538 cf::cede_to_tick;
1454} 1539}
1455 1540
1487 my ($pl) = @_; 1572 my ($pl) = @_;
1488 1573
1489 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1490 1575
1491 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1492 $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
1493 1578
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1498 1585
1499 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1626
1540 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1541 my $path = path $login; 1628 my $path = path $login;
1542 1629
1543 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1636 }
1549 1637
1580 } 1668 }
1581 1669
1582 \@paths 1670 \@paths
1583} 1671}
1584 1672
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1674
1587Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1676
1678=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1679 1678
1680Sends an ext reply to the player. 1679Sends an ext reply to the player.
1681 1680
1748our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1750 1749
1751sub generate_random_map { 1750sub generate_random_map {
1752 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
1753 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1756 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1881
1880# the temporary/swap location 1882# the temporary/swap location
1881sub save_path { 1883sub save_path {
1882 my ($self) = @_; 1884 my ($self) = @_;
1883 1885
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1886} 1888}
1887 1889
1888# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1889sub uniq_path { 1891sub uniq_path {
1890 my ($self) = @_; 1892 my ($self) = @_;
1891 1893
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1896}
1904 1897
1905sub decay_objects { 1898sub decay_objects {
1906 my ($self) = @_; 1899 my ($self) = @_;
1907 1900
1991sub find { 1984sub find {
1992 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1993 1986
1994 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1995 1988
1996 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1991
1999 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2004 or return; 1994 or return;
2005 1995
2006 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2007 1997
2009 or return; 1999 or return;
2010 2000
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2014 undef $guard1; 2005 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2006 $map->reset;
2017 return find $path; 2007 return find $path;
2018 } 2008 }
2019 2009
2020 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2038 $f->skip_block;
2049 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2050 or return; 2040 or return;
2051 2041
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2053 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2054 2044
2055 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2046 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2066 $self->decay_objects;
2077 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2078 $self->update_buttons; 2068 $self->update_buttons;
2079 cf::cede_to_tick; 2069 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2070 $self->activate;
2083 } 2071 }
2084 2072
2085 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2087 2075
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2077 }
2090 2078
2091 $self->post_load; 2079 $self->post_load;
2092} 2080}
2093 2081
2151 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2152 2140
2153 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2154 2142
2155 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2145 }
2158 2146
2159 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2160 2148
2161 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2186 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2201 }; 2189 };
2202 2190
2191 cf::get_slot 0.02;
2192
2203 if ($uniq) { 2193 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2196 } else {
2207 $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);
2215 $self->save; 2205 $self->save;
2216 2206
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2208
2219 return if $self->players; 2209 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2222 2212
2223 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2224 2214
2225 $self->deactivate; 2215 $self->deactivate;
2250 2240
2251 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252 2242
2253 return if $self->players; 2243 return if $self->players;
2254 2244
2255 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2256 2246
2257 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2258 2248
2259 # need to save uniques path 2249 # need to save uniques path
2260 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2343 2333
2344sub unique_maps() { 2334sub unique_maps() {
2345 [ 2335 [
2346 map { 2336 map {
2347 utf8::decode $_; 2337 utf8::decode $_;
2348 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2349 ? normalise $_ 2341 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2343 ]
2353} 2344}
2354 2345
2355package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 next if $dir eq "/styles";
2361
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return;
2364
2365 for (@$files) {
2366 s/\.map$// or next;
2367 utf8::decode $_;
2368 push @maps, "$dir/$_";
2369 }
2370
2371 push @dirs, map "$dir/$_", @$dirs;
2372 }
2373
2374 \@maps
2375}
2356 2376
2357=back 2377=back
2358 2378
2359=head3 cf::object 2379=head3 cf::object
2360 2380
2364 2384
2365=over 4 2385=over 4
2366 2386
2367=item $ob->inv_recursive 2387=item $ob->inv_recursive
2368 2388
2369Returns the inventory of the object _and_ their inventories, recursively. 2389Returns the inventory of the object I<and> their inventories, recursively,
2390but I<not> the object itself.
2370 2391
2371=cut 2392=cut
2372 2393
2373sub inv_recursive_; 2394sub inv_recursive_;
2374sub inv_recursive_ { 2395sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2400 inv_recursive_ inv $_[0]
2380} 2401}
2381 2402
2382=item $ref = $ob->ref 2403=item $ref = $ob->ref
2383 2404
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2405Creates and returns a persistent reference to an object that can be stored as a string.
2385 2406
2386=item $ob = cf::object::deref ($refstring) 2407=item $ob = cf::object::deref ($refstring)
2387 2408
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2409returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2410even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2442can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2443dialogue with the given NPC character.
2423 2444
2424=cut 2445=cut
2425 2446
2447our $SAY_CHANNEL = {
2448 id => "say",
2449 title => "Map",
2450 reply => "say ",
2451 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2452};
2453
2454our $CHAT_CHANNEL = {
2455 id => "chat",
2456 title => "Chat",
2457 reply => "chat ",
2458 tooltip => "Player chat and shouts, global to the server.",
2459};
2460
2426# rough implementation of a future "reply" method that works 2461# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2462# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2463#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2464sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2465 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2476 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2477 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2478
2444 } else { 2479 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2480 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2481 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2482 }
2448 } 2483 }
2449} 2484}
2450 2485
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2486=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2511
2477=item $player_object->enter_link 2512=item $player_object->enter_link
2478 2513
2479Freezes the player and moves him/her to a special map (C<{link}>). 2514Freezes the player and moves him/her to a special map (C<{link}>).
2480 2515
2481The player should be reasonably safe there for short amounts of time. You 2516The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2517for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link
2519map.
2483 2520
2484Will never block. 2521Will never block.
2485 2522
2486=item $player_object->leave_link ($map, $x, $y) 2523=item $player_object->leave_link ($map, $x, $y)
2487 2524
2545 2582
2546 $map->load; 2583 $map->load;
2547 $map->load_neighbours; 2584 $map->load_neighbours;
2548 2585
2549 return unless $self->contr->active; 2586 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2587
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2554} 2593}
2555 2594
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2596
2558Moves the player to the given map-path and coordinates by first freezing 2597Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2598her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2599that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2600the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2601be called at the end of this process.
2602
2603Note that $check will be called with a potentially non-loaded map, so if
2604it needs a loaded map it has to call C<< ->load >>.
2563 2605
2564=cut 2606=cut
2565 2607
2566our $GOTOGEN; 2608our $GOTOGEN;
2567 2609
2646} 2688}
2647 2689
2648sub prepare_random_map { 2690sub prepare_random_map {
2649 my ($exit) = @_; 2691 my ($exit) = @_;
2650 2692
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2693 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2694 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2695 # that depends on the exit object
2656 2696
2657 my $rmp = parse_random_map_params $exit->msg; 2697 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2699 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2700 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2701 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2702 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2703 $rmp->{origin_y} = $exit->y;
2704
2705 $exit->map->touch;
2664 } 2706 }
2665 2707
2666 $rmp->{random_seed} ||= $exit->random_seed; 2708 $rmp->{random_seed} ||= $exit->random_seed;
2667 2709
2668 my $data = cf::encode_json $rmp; 2710 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2711 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2712 my $meta = "$RANDOMDIR/$md5.meta";
2671 2713
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2714 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2715 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2716 undef $fh;
2675 aio_rename "$meta~", $meta; 2717 aio_rename "$meta~", $meta;
2676 2718
2719 my $slaying = "?random/$md5";
2720
2721 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2722 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2723 $exit->msg (undef);
2724 }
2679 } 2725 }
2680} 2726}
2681 2727
2682sub cf::object::player::enter_exit { 2728sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2729 my ($self, $exit) = @_;
2684 2730
2685 return unless $self->type == cf::PLAYER; 2731 return unless $self->type == cf::PLAYER;
2686 2732
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2733 $self->enter_link;
2699 2734
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2735 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2736 $Coro::current->{desc} = "enter_exit";
2706 2737
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2738 unless (eval {
2739 $self->deactivate_recursive; # just to be sure
2740
2741 # random map handling
2742 {
2743 my $guard = cf::lock_acquire "exit_prepare:$exit";
2744
2745 prepare_random_map $exit
2746 if $exit->slaying eq "/!";
2747 }
2748
2749 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2750 my $x = $exit->stats->hp;
2751 my $y = $exit->stats->sp;
2752
2709 $self->goto ($slaying, $hp, $sp); 2753 $self->goto ($map, $x, $y);
2710 2754
2755 # if exit is damned, update players death & WoR home-position
2756 $self->contr->savebed ($map, $x, $y)
2757 if $exit->flag (cf::FLAG_DAMNED);
2758
2711 1; 2759 1
2712 }) { 2760 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2761 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2762 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2763 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2764 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2765
2718 warn "ERROR in enter_exit: $@"; 2766 warn "ERROR in enter_exit: $@";
2748 2796
2749=cut 2797=cut
2750 2798
2751# non-persistent channels (usually the info channel) 2799# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2800our %CHANNEL = (
2801 "c/motd" => {
2802 id => "infobox",
2803 title => "MOTD",
2804 reply => undef,
2805 tooltip => "The message of the day",
2806 },
2753 "c/identify" => { 2807 "c/identify" => {
2754 id => "infobox", 2808 id => "infobox",
2755 title => "Identify", 2809 title => "Identify",
2756 reply => undef, 2810 reply => undef,
2757 tooltip => "Items recently identified", 2811 tooltip => "Items recently identified",
2759 "c/examine" => { 2813 "c/examine" => {
2760 id => "infobox", 2814 id => "infobox",
2761 title => "Examine", 2815 title => "Examine",
2762 reply => undef, 2816 reply => undef,
2763 tooltip => "Signs and other items you examined", 2817 tooltip => "Signs and other items you examined",
2818 },
2819 "c/shopinfo" => {
2820 id => "infobox",
2821 title => "Shop Info",
2822 reply => undef,
2823 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2824 },
2765 "c/book" => { 2825 "c/book" => {
2766 id => "infobox", 2826 id => "infobox",
2767 title => "Book", 2827 title => "Book",
2768 reply => undef, 2828 reply => undef,
2784 id => "infobox", 2844 id => "infobox",
2785 title => "Body Parts", 2845 title => "Body Parts",
2786 reply => undef, 2846 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2847 tooltip => "Shows which body parts you posess and are available",
2788 }, 2848 },
2849 "c/statistics" => {
2850 id => "infobox",
2851 title => "Statistics",
2852 reply => undef,
2853 tooltip => "Shows your primary statistics",
2854 },
2855 "c/skills" => {
2856 id => "infobox",
2857 title => "Skills",
2858 reply => undef,
2859 tooltip => "Shows your experience per skill and item power",
2860 },
2861 "c/shopitems" => {
2862 id => "infobox",
2863 title => "Shop Items",
2864 reply => undef,
2865 tooltip => "Shows the items currently for sale in this shop",
2866 },
2867 "c/resistances" => {
2868 id => "infobox",
2869 title => "Resistances",
2870 reply => undef,
2871 tooltip => "Shows your resistances",
2872 },
2873 "c/pets" => {
2874 id => "infobox",
2875 title => "Pets",
2876 reply => undef,
2877 tooltip => "Shows information abotu your pets/a specific pet",
2878 },
2879 "c/perceiveself" => {
2880 id => "infobox",
2881 title => "Perceive Self",
2882 reply => undef,
2883 tooltip => "You gained detailed knowledge about yourself",
2884 },
2789 "c/uptime" => { 2885 "c/uptime" => {
2790 id => "infobox", 2886 id => "infobox",
2791 title => "Uptime", 2887 title => "Uptime",
2792 reply => undef, 2888 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2889 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2892 id => "infobox",
2797 title => "Map Info", 2893 title => "Map Info",
2798 reply => undef, 2894 reply => undef,
2799 tooltip => "Information related to the maps", 2895 tooltip => "Information related to the maps",
2800 }, 2896 },
2897 "c/party" => {
2898 id => "party",
2899 title => "Party",
2900 reply => "gsay ",
2901 tooltip => "Messages and chat related to your party",
2902 },
2903 "c/death" => {
2904 id => "death",
2905 title => "Death",
2906 reply => undef,
2907 tooltip => "Reason for and more info about your most recent death",
2908 },
2909 "c/say" => $SAY_CHANNEL,
2910 "c/chat" => $CHAT_CHANNEL,
2801); 2911);
2802 2912
2803sub cf::client::send_msg { 2913sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2914 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2915
2806 $msg = $self->pl->expand_cfpod ($msg); 2916 $msg = $self->pl->expand_cfpod ($msg)
2917 unless $color & cf::NDI_VERBATIM;
2807 2918
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2919 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2920
2810 # check predefined channels, for the benefit of C 2921 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2922 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2923 $channel = $CHANNEL{$channel};
2813 2924
2814 $self->ext_msg (channel_info => $channel) 2925 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2926 $channel = $channel->{id};
2818 2927
2819 } elsif (ref $channel) { 2928 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2929 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2930 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2931 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2932 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2933 }
2826 2934
2827 $channel = $channel->{id}; 2935 $channel = $channel->{id};
2828 } 2936 }
2829 2937
2830 return unless @extra || length $msg; 2938 return unless @extra || length $msg;
2831 2939
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2940 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2941 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2942 if $color & cf::NDI_DEF;
2836 2943
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2944 my $pkt = "msg "
2945 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2947 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 2948
2851 $color &= cf::NDI_COLOR_MASK; 2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2852 2952
2853 utf8::encode $msg; 2953 # split very large packets
2854 2954 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2956 $pkt = "frag";
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 } 2957 }
2958
2959 $self->send_packet ($pkt);
2864} 2960}
2865 2961
2866=item $client->ext_msg ($type, @msg) 2962=item $client->ext_msg ($type, @msg)
2867 2963
2868Sends an ext event to the client. 2964Sends an ext event to the client.
3042 3138
3043The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
3044 3140
3045 cf::object 3141 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3142 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3143 insert remove name archname title slaying race decrease split
3144 value
3048 3145
3049 cf::object::player 3146 cf::object::player
3050 player 3147 player
3051 3148
3052 cf::player 3149 cf::player
3057 3154
3058=cut 3155=cut
3059 3156
3060for ( 3157for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3158 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3159 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3160 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
3067) { 3164) {
3068 no strict 'refs'; 3165 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
3088 3185
3089 my $qcode = $code; 3186 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
3092 3191
3093 local $_; 3192 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
3095 3194
3096 my $eval = 3195 my $eval =
3276 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
3278 } 3377 }
3279}; 3378};
3280 3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
3281sub reload_regions { 3390sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3391 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3392 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3394
3298} 3407}
3299 3408
3300sub reload_archetypes { 3409sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3412}
3309 3413
3310sub reload_treasures { 3414sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
3313} 3417}
3314 3418
3315sub reload_resources { 3419sub reload_resources {
3316 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
3317 3421
3422 reload_facedata;
3423 reload_archetypes;
3318 reload_regions; 3424 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3425 reload_treasures;
3323 3426
3324 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3325} 3428}
3326 3429
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3434 or return;
3334 3435
3335 local $/; 3436 local $/;
3336 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3337 3438
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3339 3440
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3448 };
3348 warn $@ if $@; 3449 warn $@ if $@;
3349 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3350} 3481}
3351 3482
3352sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3353 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3501 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3360 }; 3505 };
3361 3506
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3508
3509 cf::sync_job {
3510 reload_resources;
3511 reload_config;
3512 db_init;
3513
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid;
3517 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills;
3520
3521 cf::init_beforeplay;
3522
3523 atomic;
3524
3525 load_extensions;
3526
3527 utime time, time, $RUNTIMEFILE;
3528
3529 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532
3533 (pop @POST_INIT)->(0) while @POST_INIT;
3534 };
3535
3536 main_loop;
3369} 3537}
3370 3538
3371############################################################################# 3539#############################################################################
3372# initialisation and cleanup 3540# initialisation and cleanup
3373 3541
3379 cf::cleanup "SIG$signal"; 3547 cf::cleanup "SIG$signal";
3380 }; 3548 };
3381 } 3549 }
3382} 3550}
3383 3551
3384sub write_runtime { 3552sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3553 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3554 # the fsync below can take a very very long time.
3389 3555
3390 IO::AIO::aio_utime $runtime, undef, undef; 3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3557
3392 my $guard = cf::lock_acquire "write_runtime"; 3558 my $guard = cf::lock_acquire "write_runtime";
3393 3559
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3561 or return;
3396 3562
3397 my $value = $cf::RUNTIME + 90 + 10; 3563 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3564 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3565 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3575 aio_utime $fh, undef, undef;
3410 3576
3411 close $fh 3577 close $fh
3412 or return; 3578 or return;
3413 3579
3414 aio_rename "$runtime~", $runtime 3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3581 and return;
3416 3582
3417 warn "runtime file written.\n"; 3583 warn "runtime file written.\n";
3418 3584
3419 1 3585 1
3586}
3587
3588our $uuid_lock;
3589our $uuid_skip;
3590
3591sub write_uuid_sync($) {
3592 $uuid_skip ||= $_[0];
3593
3594 return if $uuid_lock;
3595 local $uuid_lock = 1;
3596
3597 my $uuid = "$LOCALDIR/uuid";
3598
3599 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3600 or return;
3601
3602 my $value = uuid_seq uuid_cur;
3603
3604 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n";
3606 return;
3607 }
3608
3609 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0;
3611
3612 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3613 and return;
3614
3615 # always fsync - this file is important
3616 aio_fsync $fh
3617 and return;
3618
3619 close $fh
3620 or return;
3621
3622 aio_rename "$uuid~", $uuid
3623 and return;
3624
3625 warn "uuid file written ($value).\n";
3626
3627 1
3628
3629}
3630
3631sub write_uuid($$) {
3632 my ($skip, $sync) = @_;
3633
3634 $sync ? write_uuid_sync $skip
3635 : async { write_uuid_sync $skip };
3420} 3636}
3421 3637
3422sub emergency_save() { 3638sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
3424 3640
3425 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
3426 3642
3427 cf::sync_job { 3643 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648
3428 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3655 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3657 $pl->save;
3437 } 3658 }
3438 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
3439 3660
3440 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3664 $map->valid or next;
3444 $map->save; 3665 $map->save;
3445 } 3666 }
3446 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
3447 3668
3448 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3671 warn "emergency_perl_save: end database checkpoint\n";
3672
3673 warn "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n";
3451 }; 3676 };
3452 3677
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3453 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
3454} 3684}
3455 3685
3456sub post_cleanup { 3686sub post_cleanup {
3457 my ($make_core) = @_; 3687 my ($make_core) = @_;
3458 3688
3459 warn Carp::longmess "post_cleanup backtrace" 3689 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3690 if $make_core;
3691
3692 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$;
3694}
3695
3696# a safer delete_package, copied from Symbol
3697sub clear_package($) {
3698 my $pkg = shift;
3699
3700 # expand to full symbol table name if needed
3701 unless ($pkg =~ /^main::.*::$/) {
3702 $pkg = "main$pkg" if $pkg =~ /^::/;
3703 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3704 $pkg .= '::' unless $pkg =~ /::$/;
3705 }
3706
3707 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3708 my $stem_symtab = *{$stem}{HASH};
3709
3710 defined $stem_symtab and exists $stem_symtab->{$leaf}
3711 or return;
3712
3713 # clear all symbols
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 }
3719 warn "cleared package $pkg\n";#d#
3461} 3720}
3462 3721
3463sub do_reload_perl() { 3722sub do_reload_perl() {
3464 # can/must only be called in main 3723 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3724 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
3467 return; 3726 return;
3468 } 3727 }
3469 3728
3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3732
3733 while ($RELOAD) {
3470 warn "reloading..."; 3734 warn "reloading...";
3471 3735
3472 warn "entering sync_job"; 3736 warn "entering sync_job";
3473 3737
3474 cf::sync_job { 3738 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3740 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3478 3742
3479 warn "syncing database to disk"; 3743 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3745
3482 # if anything goes wrong in here, we should simply crash as we already saved 3746 # if anything goes wrong in here, we should simply crash as we already saved
3483 3747
3484 warn "flushing outstanding aio requests"; 3748 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3749 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3751 }
3516 3752
3517 warn "... nuking $pkg"; 3753 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3754 $_->cancel for values %EXT_CORO;
3519 } 3755 %EXT_CORO = ();
3520 3756
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3757 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3758 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3759
3760 warn "removing ext/exti commands";
3761 %EXTCMD = ();
3762 %EXTICMD = ();
3763
3764 warn "unloading/nuking all extensions";
3765 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3766 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3767
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3768 if (my $cb = $pkg->can ("unload")) {
3769 eval {
3532 $cb->(); 3770 $cb->($pkg);
3771 1
3772 } or warn "$pkg unloaded, but with errors: $@";
3773 }
3774
3775 warn "... clearing $pkg";
3776 clear_package $pkg;
3533 } 3777 }
3534 3778
3535 Symbol::delete_package $k; 3779 warn "unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782
3783 warn "... unloading $k";
3784 delete $INC{$k};
3785
3786 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g;
3788
3789 if (my $cb = $k->can ("unload_module")) {
3790 $cb->();
3791 }
3792
3793 clear_package $k;
3536 } 3794 }
3537 3795
3538 warn "getting rid of safe::, as good as possible"; 3796 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3797 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3799
3542 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3803
3546 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3805 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
3549 3807
3550 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
3551 3809
3552 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
3553 require cf; 3811 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
3555 3813
3556 warn "loading config and database again"; 3814 warn "loading config and database again";
3557 cf::reload_config; 3815 cf::reload_config;
3558 3816
3559 warn "loading extensions"; 3817 warn "loading extensions";
3560 cf::load_extensions; 3818 cf::load_extensions;
3561 3819
3820 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
3568 3828
3829 warn "running post_init jobs";
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831
3569 warn "leaving sync_job"; 3832 warn "leaving sync_job";
3570 3833
3571 1 3834 1
3572 } or do { 3835 } or do {
3573 warn $@; 3836 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3837 cf::cleanup "error while reloading, exiting.";
3575 }; 3838 };
3576 3839
3577 warn "reloaded"; 3840 warn "reloaded";
3841 --$RELOAD;
3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
3578}; 3846};
3579 3847
3580our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
3581 3849
3582sub reload_perl() { 3850sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
3585 3853
3854 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions;
3856
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3858 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
3860 };
3589 }; 3861 };
3590} 3862}
3591 3863
3592register_command "reload" => sub { 3864register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
3607 3879
3608our @WAIT_FOR_TICK; 3880our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3881our @WAIT_FOR_TICK_BEGIN;
3610 3882
3611sub wait_for_tick { 3883sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3884 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3885
3615 my $signal = new Coro::Signal; 3886 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3887 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3888 $signal->wait;
3618} 3889}
3619 3890
3620sub wait_for_tick_begin { 3891sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3892 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3893
3624 my $signal = new Coro::Signal; 3894 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3895 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3896 $signal->wait;
3627} 3897}
3637 3907
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3908 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3910 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3911 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3912 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3913 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3914 };
3645 } 3915 }
3646 3916
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3936{
3667 # configure BDB 3937 # configure BDB
3668 3938
3669 BDB::min_parallel 8; 3939 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3940 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3941 $AnyEvent::BDB::WATCHER->priority (1);
3672 3942
3673 unless ($DB_ENV) { 3943 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3944 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3945 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3946 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3947 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3948 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3949 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3950
3680 cf::sync_job { 3951 cf::sync_job {
3681 eval { 3952 eval {
3707{ 3978{
3708 # configure IO::AIO 3979 # configure IO::AIO
3709 3980
3710 IO::AIO::min_parallel 8; 3981 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3982 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3983 undef $AnyEvent::AIO::WATCHER;
3713} 3984}
3714 3985
3715my $_log_backtrace; 3986my $_log_backtrace;
3716 3987
3717sub _log_backtrace { 3988sub _log_backtrace {
3720 $msg =~ s/\n//; 3991 $msg =~ s/\n//;
3721 3992
3722 # limit the # of concurrent backtraces 3993 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3994 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3995 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg;
3725 async { 3997 async {
3726 $Coro::current->{desc} = "abt $msg"; 3998 $Coro::current->{desc} = "abt $msg";
3727 3999
3728 my @bt = fork_call { 4000 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4001 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4012 }
3741 4013
3742 @funcs 4014 @funcs
3743 }; 4015 };
3744 4016
3745 LOG llevInfo, "[ABT] $msg\n"; 4017 LOG llevInfo, "[ABT] $perl_bt\n";
4018 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4019 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4020 --$_log_backtrace;
3748 }; 4021 };
3749 } else { 4022 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4023 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4025 }
3753} 4026}
3754 4027
3755# load additional modules 4028# load additional modules
3756use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3757 4031
3758END { cf::emergency_save } 4032END { cf::emergency_save }
3759 4033
37601 40341
3761 4035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines