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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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 ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5; 58use Digest::MD5;
52use Fcntl; 59use Fcntl;
53use YAML (); 60use YAML::XS ();
54use IO::AIO 2.51 (); 61use IO::AIO ();
55use Time::HiRes; 62use Time::HiRes;
56use Compress::LZF; 63use Compress::LZF;
57use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
58 67
59# configure various modules to our taste 68# configure various modules to our taste
60# 69#
61$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 78
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 81
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 83
69our %COMMAND = (); 84our %COMMAND = ();
70our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
73our %EXTCMD = (); 88our %EXTCMD = ();
74our %EXTICMD = (); 89our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
77 92
78our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
80 97
81our $CONFDIR = confdir; 98our $CONFDIR = confdir;
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
92our %RESOURCE; 112our %RESOURCE;
93 113
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 116our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
99 118
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 122our $DB_ENV;
105 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
106our %CFG; 126our %CFG;
107 127
108our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 129our $RUNTIME;
110our $NOW; 130our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 141our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
123 143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
148
124binmode STDOUT; 149binmode STDOUT;
125binmode STDERR; 150binmode STDERR;
126 151
127# read virtual server time, if available 152# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
132} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
133 160
134mkdir $_ 161mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 163
137our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
138 165
139sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 178
141############################################################################# 179#############################################################################
142 180
143=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
144 182
191returns directly I<after> the tick processing (and consequently, can only wake one process 229returns 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. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 231
194=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
195 233
196This array contains the results of the last C<invoke ()> call. When 234This 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 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 236that call.
199 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
200=back 244=back
201 245
202=cut 246=cut
203 247
204BEGIN { 248$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 249 my $msg = join "", @_;
207 250
208 $msg .= "\n" 251 $msg .= "\n"
209 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
210 253
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 255
213 LOG llevError, $msg; 256 LOG llevError, $msg;
214 }; 257};
215}
216 258
217$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
219 263
220 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 266 return;#d#
223 }#d# 267 }#d#
224 268
225 # kill coroutine otherwise 269 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 270 Coro::terminate
228}; 271};
229
230$SIG{__DIE__} = sub { }; #d#?
231 272
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 283for my $pkg (qw(
243 cf::global cf::attachable 284 cf::global cf::attachable
244 cf::object cf::object::player 285 cf::object cf::object::player
245 cf::client cf::player 286 cf::client cf::player
246 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
247 cf::map cf::party cf::region 289 cf::party cf::region
248)) { 290)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 292}
252 293
253$EV::DIED = sub { 294$EV::DIED = sub {
254 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
255}; 296};
256 297
257############################################################################# 298#############################################################################
258 299
259=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 338
298sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
300 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
301=item cf::lock_wait $string 356=item cf::lock_wait $string
302 357
303Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
304 359
305=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
306 361
307Wait until the given lock is available and then acquires it and returns 362Wait 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, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
310returned. 365returned.
311 366
312Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 368deadlocked coro.
319 374
320Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
321 376
322=cut 377=cut
323 378
324our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 380
327sub lock_wait($) { 381sub lock_wait($) {
328 my ($key) = @_; 382 $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} 383}
341 384
342sub lock_acquire($) { 385sub lock_acquire($) {
343 my ($key) = @_; 386 $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} 387}
357 388
358sub lock_active($) { 389sub lock_active($) {
359 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
427 } 456 }
428 } 457 }
429}; 458};
430 459
431sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
432 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
433 464
434 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
436 467
722 753
723############################################################################# 754#############################################################################
724 755
725=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
726 757
727Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
730 761
731In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
783 814
784Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
786 817
787Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
789 820
790These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
791 822
792=over 4 823=over 4
1083 1114
1084sub reattach { 1115sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1117 my ($obj) = @_;
1087 1118
1119 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1121
1090 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1091 1123
1092 @$registry = (); 1124 @$registry = ();
1093 1125
1139 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1142 1174
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1147 close $fh; 1182 aio_close $fh;
1148 1183
1149 if (@$objs) { 1184 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1155 close $fh; 1193 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1195 }
1158 } else { 1196 } else {
1159 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1160 } 1198 }
1161 1199
1162 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1204 } else {
1164 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1165 } 1206 }
1166 } else { 1207 } else {
1167 aio_unlink $filename; 1208 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1169 } 1210 }
1260 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1261 1302
1262 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1263} 1304}
1264 1305
1306use File::Glob ();
1307
1265cf::player->attach ( 1308cf::player->attach (
1266 on_command => sub { 1309 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1268 1311
1269 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1301 1344
1302 cf::override; 1345 cf::override;
1303 }, 1346 },
1304); 1347);
1305 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1306sub load_extensions { 1362sub load_extensions {
1307 cf::sync_job { 1363 cf::sync_job {
1308 my %todo; 1364 my %todo;
1309 1365
1310 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1329 1385
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1388
1333 $ext{source} = 1389 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1336 . $source 1392 . $source
1337 . "\n};\n1"; 1393 . "\n};\n1";
1338 1394
1339 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1379 1435
1380=back 1436=back
1381 1437
1382=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1383 1439
1384Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1385 1441
1386=cut 1442=cut
1387 1443
1388package cf::player; 1444package cf::player;
1389 1445
1432 1488
1433sub exists($) { 1489sub exists($) {
1434 my ($login) = @_; 1490 my ($login) = @_;
1435 1491
1436 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1438} 1494}
1439 1495
1440sub find($) { 1496sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1498 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1511 or return;
1456 1512
1457 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1458 or return; 1514 or return;
1515
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1462 } 1519 }
1463 } 1520 }
1473 1530
1474 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1475 1532
1476 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1478 1537
1479 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1539 cf::cede_to_tick;
1481} 1540}
1482 1541
1514 my ($pl) = @_; 1573 my ($pl) = @_;
1515 1574
1516 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1517 1576
1518 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1579
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1525 1586
1526 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1627
1567 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1568 my $path = path $login; 1629 my $path = path $login;
1569 1630
1570 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1637 }
1576 1638
1607 } 1669 }
1608 1670
1609 \@paths 1671 \@paths
1610} 1672}
1611 1673
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1675
1614Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1677
1705=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1706 1679
1707Sends an ext reply to the player. 1680Sends an ext reply to the player.
1708 1681
1909 1882
1910# the temporary/swap location 1883# the temporary/swap location
1911sub save_path { 1884sub save_path {
1912 my ($self) = @_; 1885 my ($self) = @_;
1913 1886
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1916} 1889}
1917 1890
1918# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1919sub uniq_path { 1892sub uniq_path {
1920 my ($self) = @_; 1893 my ($self) = @_;
1921 1894
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1897}
1934 1898
1935sub decay_objects { 1899sub decay_objects {
1936 my ($self) = @_; 1900 my ($self) = @_;
1937 1901
2021sub find { 1985sub find {
2022 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2023 1987
2024 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2025 1989
2026 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1992
2029 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2034 or return; 1995 or return;
2035 1996
2036 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2037 1998
2039 or return; 2000 or return;
2040 2001
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2044 undef $guard1; 2006 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2007 $map->reset;
2047 return find $path; 2008 return find $path;
2048 } 2009 }
2049 2010
2050 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2039 $f->skip_block;
2079 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2080 or return; 2041 or return;
2081 2042
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2083 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2084 2045
2085 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2047 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2067 $self->decay_objects;
2107 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2108 $self->update_buttons; 2069 $self->update_buttons;
2109 cf::cede_to_tick; 2070 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2071 $self->activate;
2113 } 2072 }
2114 2073
2115 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2117 2076
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2078 }
2120 2079
2121 $self->post_load; 2080 $self->post_load;
2122} 2081}
2123 2082
2181 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2182 2141
2183 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2184 2143
2185 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2146 }
2188 2147
2189 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2190 2149
2191 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2187 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2231 }; 2190 };
2232 2191
2192 cf::get_slot 0.02;
2193
2233 if ($uniq) { 2194 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2197 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2206 $self->save;
2246 2207
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2209
2249 return if $self->players; 2210 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2252 2213
2253 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2254 2215
2255 $self->deactivate; 2216 $self->deactivate;
2280 2241
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2243
2283 return if $self->players; 2244 return if $self->players;
2284 2245
2285 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2286 2247
2287 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2288 2249
2289 # need to save uniques path 2250 # need to save uniques path
2290 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2373 2334
2374sub unique_maps() { 2335sub unique_maps() {
2375 [ 2336 [
2376 map { 2337 map {
2377 utf8::decode $_; 2338 utf8::decode $_;
2378 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2379 ? normalise $_ 2342 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2344 ]
2383} 2345}
2384 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2385=back 2379=back
2386 2380
2387=head3 cf::object 2381=head3 cf::object
2388 2382
2389=cut 2383=cut
2392 2386
2393=over 4 2387=over 4
2394 2388
2395=item $ob->inv_recursive 2389=item $ob->inv_recursive
2396 2390
2397Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2398 2393
2399=cut 2394=cut
2400 2395
2401sub inv_recursive_; 2396sub inv_recursive_;
2402sub inv_recursive_ { 2397sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2408} 2403}
2409 2404
2410=item $ref = $ob->ref 2405=item $ref = $ob->ref
2411 2406
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2413 2408
2414=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2415 2410
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2412even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2445dialogue with the given NPC character.
2451 2446
2452=cut 2447=cut
2453 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2454# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2464# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2480
2472 } else { 2481 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2484 }
2476 } 2485 }
2477} 2486}
2478 2487
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2513
2505=item $player_object->enter_link 2514=item $player_object->enter_link
2506 2515
2507Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2508 2517
2509The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2511 2522
2512Will never block. 2523Will never block.
2513 2524
2514=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2515 2526
2567 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2569 2580
2570 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2573 2584
2574 $map->load; 2585 $map->load;
2575 $map->load_neighbours; 2586 $map->load_neighbours;
2576 2587
2577 return unless $self->contr->active; 2588 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2589
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2582} 2595}
2583 2596
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2585 2598
2586Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2591 2607
2592=cut 2608=cut
2593 2609
2594our $GOTOGEN; 2610our $GOTOGEN;
2595 2611
2674} 2690}
2675 2691
2676sub prepare_random_map { 2692sub prepare_random_map {
2677 my ($exit) = @_; 2693 my ($exit) = @_;
2678 2694
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2697 # that depends on the exit object
2684 2698
2685 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2701 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2692 } 2708 }
2693 2709
2694 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2695 2711
2696 my $data = cf::encode_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2699 2715
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2718 undef $fh;
2703 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2704 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2707 } 2727 }
2708} 2728}
2709 2729
2710sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2712 2732
2713 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2714 2734
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2735 $self->enter_link;
2727 2736
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2737 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2734 2739
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2737 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2738 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2739 1; 2761 1
2740 }) { 2762 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2767
2746 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2765 2787
2766 utf8::encode $text; 2788 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2768} 2815}
2769 2816
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2818
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2823
2777=cut 2824=cut
2778 2825
2779# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2781 "c/identify" => { 2834 "c/identify" => {
2782 id => "infobox", 2835 id => "infobox",
2783 title => "Identify", 2836 title => "Identify",
2784 reply => undef, 2837 reply => undef,
2785 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2787 "c/examine" => { 2840 "c/examine" => {
2788 id => "infobox", 2841 id => "infobox",
2789 title => "Examine", 2842 title => "Examine",
2790 reply => undef, 2843 reply => undef,
2791 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2851 },
2793 "c/book" => { 2852 "c/book" => {
2794 id => "infobox", 2853 id => "infobox",
2795 title => "Book", 2854 title => "Book",
2796 reply => undef, 2855 reply => undef,
2812 id => "infobox", 2871 id => "infobox",
2813 title => "Body Parts", 2872 title => "Body Parts",
2814 reply => undef, 2873 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2816 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2817 "c/uptime" => { 2912 "c/uptime" => {
2818 id => "infobox", 2913 id => "infobox",
2819 title => "Uptime", 2914 title => "Uptime",
2820 reply => undef, 2915 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2919 id => "infobox",
2825 title => "Map Info", 2920 title => "Map Info",
2826 reply => undef, 2921 reply => undef,
2827 tooltip => "Information related to the maps", 2922 tooltip => "Information related to the maps",
2828 }, 2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2829); 2938);
2830 2939
2831sub cf::client::send_msg { 2940sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2942
2834 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2835 2945
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2947
2838 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2841 2951
2842 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2846 2954
2847 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 2960 }
2854 2961
2855 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2856 } 2963 }
2857 2964
2858 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2859 2966
2860 if ($self->can_msg) {
2861 # default colour, mask it out 2967 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2864 2970
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 2974 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 2975
2879 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 2977}
2893 2978
2894=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2895 2980
2896Sends an ext event to the client. 2981Sends an ext event to the client.
2899 2984
2900sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2902 2987
2903 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 2993 }
2909} 2994}
2910 2995
2911=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2912 2997
2916 3001
2917sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2919 3004
2920 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3008 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3011 }
2927} 3012}
2928 3013
2929=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2930 3015
3070 3155
3071The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3072 3157
3073 cf::object 3158 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
3076 3162
3077 cf::object::player 3163 cf::object::player
3078 player 3164 player
3079 3165
3080 cf::player 3166 cf::player
3085 3171
3086=cut 3172=cut
3087 3173
3088for ( 3174for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3095) { 3181) {
3096 no strict 'refs'; 3182 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3115 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3116 3202
3117 my $qcode = $code; 3203 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3120 3208
3121 local $_; 3209 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3123 3211
3124 my $eval = 3212 my $eval =
3304 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
3306 } 3394 }
3307}; 3395};
3308 3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3406
3309sub reload_regions { 3407sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3409 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3411
3326} 3424}
3327 3425
3328sub reload_archetypes { 3426sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3429}
3337 3430
3338sub reload_treasures { 3431sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3341} 3434}
3342 3435
3343sub reload_resources { 3436sub reload_resources {
3344 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3345 3438
3439 reload_facedata;
3440 reload_archetypes;
3346 reload_regions; 3441 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3442 reload_treasures;
3351 3443
3352 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3353} 3445}
3354 3446
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3451 or return;
3362 3452
3363 local $/; 3453 local $/;
3364 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3365 3455
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3457
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3465 };
3376 warn $@ if $@; 3466 warn $@ if $@;
3377 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3378} 3498}
3379 3499
3380sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3381 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3518 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3388 }; 3522 };
3389 3523
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3524 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3525
3526 cf::sync_job {
3527 reload_resources;
3528 reload_config;
3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3542 load_extensions;
3543
3544 utime time, time, $RUNTIMEFILE;
3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
3397} 3554}
3398 3555
3399############################################################################# 3556#############################################################################
3400# initialisation and cleanup 3557# initialisation and cleanup
3401 3558
3408 }; 3565 };
3409 } 3566 }
3410} 3567}
3411 3568
3412sub write_runtime_sync { 3569sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime";
3414
3415 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3417 3572
3418 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3574
3420 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3421 3576
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423 or return; 3578 or return;
3424 3579
3425 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3438 3593
3439 close $fh 3594 close $fh
3440 or return; 3595 or return;
3441 3596
3442 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3598 and return;
3444 3599
3445 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3446 3601
3447 1 3602 1
3459 my $uuid = "$LOCALDIR/uuid"; 3614 my $uuid = "$LOCALDIR/uuid";
3460 3615
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3617 or return;
3463 3618
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3627 $uuid_skip = 0;
3466 3628
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3630 and return;
3469 3631
3491} 3653}
3492 3654
3493sub emergency_save() { 3655sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3495 3657
3496 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3497 3659
3498 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3499 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3672 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3674 $pl->save;
3508 } 3675 }
3509 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3510 3677
3511 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3681 $map->valid or next;
3515 $map->save; 3682 $map->save;
3516 } 3683 }
3517 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3518 3685
3519 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3522 3689
3523 warn "begin write uuid\n"; 3690 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3691 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3692 warn "emergency_perl_save: end write uuid\n";
3526 }; 3693 };
3527 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3528 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3529} 3701}
3530 3702
3531sub post_cleanup { 3703sub post_cleanup {
3532 my ($make_core) = @_; 3704 my ($make_core) = @_;
3533 3705
3534 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3536} 3737}
3537 3738
3538sub do_reload_perl() { 3739sub do_reload_perl() {
3539 # can/must only be called in main 3740 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3542 return; 3743 return;
3543 } 3744 }
3544 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3545 warn "reloading..."; 3751 warn "reloading...";
3546 3752
3547 warn "entering sync_job"; 3753 warn "entering sync_job";
3548 3754
3549 cf::sync_job { 3755 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3757 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3553 3759
3554 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3762
3557 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3558 3764
3559 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3768 }
3591 3769
3592 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3594 } 3772 %EXT_CORO = ();
3595 3773
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3784
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3607 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3608 } 3794 }
3609 3795
3610 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3611 } 3811 }
3612 3812
3613 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3816
3617 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3820
3621 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3822 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3624 3824
3625 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3626 3826
3627 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3628 require cf; 3828 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3630 3830
3631 warn "loading config and database again"; 3831 warn "loading config and database again";
3632 cf::reload_config; 3832 cf::reload_config;
3633 3833
3634 warn "loading extensions"; 3834 warn "loading extensions";
3635 cf::load_extensions; 3835 cf::load_extensions;
3636 3836
3837 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3643 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3644 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3645 3850
3646 1 3851 1
3647 } or do { 3852 } or do {
3648 warn $@; 3853 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3650 }; 3855 };
3651 3856
3652 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3653}; 3863};
3654 3864
3655our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3656 3866
3657sub reload_perl() { 3867sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3660 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3875 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3877 };
3664 }; 3878 };
3665} 3879}
3666 3880
3667register_command "reload" => sub { 3881register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3682 3896
3683our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3685 3899
3686sub wait_for_tick { 3900sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3689 3902
3690 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3905 $signal->wait;
3693} 3906}
3694 3907
3695sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3698 3910
3699 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3913 $signal->wait;
3702} 3914}
3741{ 3953{
3742 # configure BDB 3954 # configure BDB
3743 3955
3744 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3745 BDB::max_poll_reqs $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3958 $AnyEvent::BDB::WATCHER->priority (1);
3747 3959
3748 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3967
3755 cf::sync_job { 3968 cf::sync_job {
3756 eval { 3969 eval {
3782{ 3995{
3783 # configure IO::AIO 3996 # configure IO::AIO
3784 3997
3785 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4000 undef $AnyEvent::AIO::WATCHER;
3788} 4001}
3789 4002
3790my $_log_backtrace; 4003my $_log_backtrace;
3791 4004
3792sub _log_backtrace { 4005sub _log_backtrace {
3795 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3796 4009
3797 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3800 async { 4014 async {
3801 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3802 4016
3803 my @bt = fork_call { 4017 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4029 }
3816 4030
3817 @funcs 4031 @funcs
3818 }; 4032 };
3819 4033
3820 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4037 --$_log_backtrace;
3823 }; 4038 };
3824 } else { 4039 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4042 }
3828} 4043}
3829 4044
3830# load additional modules 4045# load additional modules
3831use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3832 4048
3833END { cf::emergency_save } 4049END { cf::emergency_save }
3834 4050
38351 40511
3836 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines