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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 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,2009,2010,2011 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
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 75
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
89our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
95our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
96 120
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 123our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
101 125
102our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 129our $DB_ENV;
106 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
107our %CFG; 133our %CFG;
108 134
109our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
111our $NOW; 138our $NOW;
112 139
113our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
114our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
115our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 149our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
124 151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
159
125binmode STDOUT; 160binmode STDOUT;
126binmode STDERR; 161binmode STDERR;
127 162
128# read virtual server time, if available 163# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
133} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
134 171
135mkdir $_ 172mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 174
138our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
139 176
140sub cf::map::normalise; 177sub cf::map::normalise;
141 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
142############################################################################# 183#############################################################################
143 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
144=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
145 197
146=over 4 198=over 4
147 199
148=item $cf::UPTIME 200=item $cf::UPTIME
149 201
150The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
151 218
152=item $cf::RUNTIME 219=item $cf::RUNTIME
153 220
154The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
155every server tick. 222every server tick.
161Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
162directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
163unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
164database environment. 231database environment.
165 232
166=item $cf::NOW
167
168The time of the last (current) server tick.
169
170=item $cf::TICK
171
172The interval between server ticks, in seconds.
173
174=item $cf::LOADAVG 233=item $cf::LOADAVG
175 234
176The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
177(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
178objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
187from wherever your confdir points to. 246from wherever your confdir points to.
188 247
189=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
190 249
191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
192returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
195=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
196 272
197This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 275that call.
200 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
201=back 283=back
202 284
203=cut 285=cut
204 286
205BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
206 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
207 my $msg = join "", @_; 294 my $msg = join "", @_;
208 295
209 $msg .= "\n" 296 $msg .= "\n"
210 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
211 298
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 300
214 LOG llevError, $msg; 301 LOG llevWarn, $msg;
215 }; 302};
216}
217 303
218$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
220 306
221 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 311 return;#d#
224 }#d# 312 }#d#
225 313
226 # kill coroutine otherwise 314 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 315 Coro::terminate
229}; 316};
230
231$SIG{__DIE__} = sub { }; #d#?
232 317
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
246 cf::client cf::player 331 cf::client cf::player
247 cf::arch cf::living 332 cf::arch cf::living
248 cf::map cf::mapspace 333 cf::map cf::mapspace
249 cf::party cf::region 334 cf::party cf::region
250)) { 335)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 337}
254 338
255$EV::DIED = sub { 339$EV::DIED = sub {
256 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
257}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
258 347
259############################################################################# 348#############################################################################
260 349
261=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
262 351
283 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
284 $d 373 $d
285 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
286} 375}
287 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
288=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
289 392
290Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
291 394
292=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 402
300sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
302 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
303=item cf::lock_wait $string 468=item cf::lock_wait $string
304 469
305Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
306 471
307=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
308 473
309Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
312returned. 477returned.
313 478
314Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 480deadlocked coro.
321 486
322Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
323 488
324=cut 489=cut
325 490
326our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 492
329sub lock_wait($) { 493sub lock_wait($) {
330 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 495}
343 496
344sub lock_acquire($) { 497sub lock_acquire($) {
345 my ($key) = @_; 498 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 499}
359 500
360sub lock_active($) { 501sub lock_active($) {
361 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 503}
365 504
366sub freeze_mainloop { 505sub freeze_mainloop {
367 tick_inhibit_inc; 506 tick_inhibit_inc;
368 507
369 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
370} 509}
371 510
372=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
373 512
374Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer. 514get spread over time.
376 515
377=cut 516=cut
378 517
379sub periodic($$) { 518sub periodic($$) {
380 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
384 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
385} 524}
386 525
387=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
388 527
389Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
390This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
391of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
392 535
393The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
394used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
395 538
396Useful for short background jobs. 539Useful for short background jobs.
397 540
398=cut 541=cut
399 542
400our @SLOT_QUEUE; 543our @SLOT_QUEUE;
401our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
402 546
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
406 550
407 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
408 553
409 while () { 554 while () {
410 next_job: 555 next_job:
556
411 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 558
413 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 563 $job->[2]->send;
417 Coro::cede; 564 Coro::cede;
418 goto next_job; 565 goto next_job;
419 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 568 }
421 } 569 }
422 570
423 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
426 $signal->wait;
427 } else { 574 } else {
575 $busy = 0;
428 Coro::schedule; 576 Coro::schedule;
429 } 577 }
430 } 578 }
431}; 579};
432 580
433sub get_slot($;$$) { 581sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
435 583
436 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
437 585
438 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
439 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
440 589
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
469=cut 618=cut
470 619
471sub sync_job(&) { 620sub sync_job(&) {
472 my ($job) = @_; 621 my ($job) = @_;
473 622
474 if ($Coro::current == $Coro::main) { 623 if (in_main) {
475 my $time = EV::time; 624 my $time = AE::time;
476 625
477 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
479 628
480 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
481 630
482 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
483 632
484 my $busy = 1; 633 my $busy = 1;
485 my @res; 634 my @res;
486 635
487 (async { 636 (async {
488 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
489 @res = eval { $job->() }; 638 @res = eval { $job->() };
490 warn $@ if $@; 639 error $@ if $@;
491 undef $busy; 640 undef $busy;
492 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
493 642
494 while ($busy) { 643 while ($busy) {
495 if (Coro::nready) { 644 if (Coro::nready) {
497 } else { 646 } else {
498 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
499 } 648 }
500 } 649 }
501 650
502 my $time = EV::time - $time; 651 my $time = AE::time - $time;
503 652
504 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
505 654
506 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
507 } else { 656 } else {
529 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
530 679
531 $coro 680 $coro
532} 681}
533 682
534=item fork_call { }, $args 683=item fork_call { }, @args
535 684
536Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling. 688never block itself or use any form of event handling.
540 689
541=cut 690=cut
542 691
692sub post_fork {
693 reset_signals;
694}
695
543sub fork_call(&@) { 696sub fork_call(&@) {
544 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
545 698
546 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
547 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
549 702
550 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
551 reset_signals; 704 cf::post_fork;
552 &$cb 705 &$cb
553 }, @args; 706 } @args;
554 707
555 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
556} 720}
557 721
558=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
559 723
560=cut 724=cut
597within each server. 761within each server.
598 762
599=cut 763=cut
600 764
601sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
602 my ($name) = @_; 769 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
604 771
605 eval { 772 eval {
606 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
616} 783}
617 784
618our $DB; 785our $DB;
619 786
620sub db_init { 787sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
623 };
624} 789}
625 790
626sub db_get($$) { 791sub db_get($$) {
627 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
628 793
629 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
630 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
631 798
632 $! ? () 799 $! ? ()
633 : $data 800 : $data
634 }
635} 801}
636 802
637sub db_put($$$) { 803sub db_put($$$) {
638 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
667 833
668 my @data; 834 my @data;
669 my $md5; 835 my $md5;
670 836
671 for (0 .. $#$src) { 837 for (0 .. $#$src) {
672 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
673 or Carp::croak "$src->[$_]: $!";
674 } 839 }
675 840
676 # if processing is expensive, check 841 # if processing is expensive, check
677 # checksum first 842 # checksum first
678 if (1) { 843 if (1) {
695 860
696 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
697 my $data = $process->(\@data); 862 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
699 864
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
701 866
702 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
705 870
715 880
716=cut 881=cut
717 882
718sub datalog($@) { 883sub datalog($@) {
719 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
720 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
721} 886}
722 887
723=back 888=back
724 889
725=cut 890=cut
726 891
727############################################################################# 892#############################################################################
728 893
729=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
730 895
731Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
734 899
735In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
786=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
787 952
788Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
790 955
791Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
793 958
794These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
795 960
796=over 4 961=over 4
920 1085
921 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
922 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
923 1088
924 } elsif (ref $type) { 1089 } elsif (ref $type) {
925 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
926 1091
927 } else { 1092 } else {
928 shift @arg; 1093 shift @arg;
929 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
930 } 1095 }
931 } 1096 }
932} 1097}
933 1098
934sub _object_attach { 1099sub _object_attach {
944 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
945 } 1110 }
946 1111
947 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
948 } else { 1113 } else {
949 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
950 } 1115 }
951 1116
952 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
953} 1118}
954 1119
1013 1178
1014 for (@$callbacks) { 1179 for (@$callbacks) {
1015 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1016 1181
1017 if ($@) { 1182 if ($@) {
1018 warn "$@";
1019 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1020 override; 1184 override;
1021 } 1185 }
1022 1186
1023 return 1 if $override; 1187 return 1 if $override;
1024 } 1188 }
1087 1251
1088sub reattach { 1252sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1254 my ($obj) = @_;
1091 1255
1256 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1258
1094 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1095 1260
1096 @$registry = (); 1261 @$registry = ();
1097 1262
1102 for (@$attach) { 1267 for (@$attach) {
1103 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1104 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1105 } 1270 }
1106 } else { 1271 } else {
1107 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1108 } 1273 }
1109 } 1274 }
1110} 1275}
1111 1276
1112cf::attachable->attach ( 1277cf::attachable->attach (
1139 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1140 1305
1141 sync_job { 1306 sync_job {
1142 if (length $$rdata) { 1307 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1144 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1145 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1146 1312
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1151 aio_close $fh; 1320 aio_close $fh;
1152 1321
1153 if (@$objs) { 1322 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1159 aio_close $fh; 1331 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1333 }
1162 } else { 1334 } else {
1163 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1164 } 1336 }
1165 1337
1166 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1342 } else {
1168 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1169 } 1344 }
1170 } else { 1345 } else {
1171 aio_unlink $filename; 1346 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1173 } 1348 }
1197 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs}; 1373 $av = $st->{objs};
1199 } 1374 }
1200 1375
1201 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1202 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1203 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1204 1380
1205 ($data, $av) 1381 ($data, $av)
1206} 1382}
1207 1383
1208=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1264 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1265 1441
1266 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1267} 1443}
1268 1444
1445use File::Glob ();
1446
1269cf::player->attach ( 1447cf::player->attach (
1270 on_command => sub { 1448 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1272 1450
1273 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1274 or return; 1452 or return;
1275 1453
1298 1476
1299 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1300 if $reply; 1478 if $reply;
1301 1479
1302 } else { 1480 } else {
1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1304 } 1482 }
1305 1483
1306 cf::override; 1484 cf::override;
1307 }, 1485 },
1308); 1486);
1309 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1310sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1311 cf::sync_job { 1504 cf::sync_job {
1312 my %todo; 1505 my %todo;
1313 1506
1314 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1315 next unless -r $path; 1508 next unless -r $path;
1333 1526
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1529
1337 $ext{source} = 1530 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1339 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1340 . $source 1533 . $source
1341 . "\n};\n1"; 1534 . "\n};\n1";
1342 1535
1343 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1344 } 1537 }
1345 1538
1539 my $pass = 0;
1346 my %done; 1540 my %done;
1347 while (%todo) { 1541 while (%todo) {
1348 my $progress; 1542 my $progress;
1349 1543
1544 ++$pass;
1545
1546 ext:
1350 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1549 next ext
1353 unless exists $done{$_}; 1550 unless exists $done{$_};
1354 } 1551 }
1355 1552
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1554
1358 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1559
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1561 if exists $v->{meta}{mandatory};
1366 1562
1367 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1368 } 1572 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1573 }
1374 1574
1375 skip: 1575 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1378 } 1585 }
1379 }; 1586 };
1380} 1587}
1381 1588
1382############################################################################# 1589#############################################################################
1383 1590
1384=back 1591=back
1385 1592
1386=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1387 1594
1388Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1389 1596
1390=cut 1597=cut
1391 1598
1392package cf::player; 1599package cf::player;
1393 1600
1436 1643
1437sub exists($) { 1644sub exists($) {
1438 my ($login) = @_; 1645 my ($login) = @_;
1439 1646
1440 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1442} 1649}
1443 1650
1444sub find($) { 1651sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1653 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1467 } 1674 }
1468 } 1675 }
1469} 1676}
1470 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1471sub save($) { 1691sub save($) {
1472 my ($pl) = @_; 1692 my ($pl) = @_;
1473 1693
1474 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1475 1695
1480 1700
1481 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1483 1703
1484 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1485 1708
1486 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1710 cf::cede_to_tick;
1488} 1711}
1489 1712
1521 my ($pl) = @_; 1744 my ($pl) = @_;
1522 1745
1523 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1524 1747
1525 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1750
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1529 $pl->deactivate; 1752 $pl->deactivate;
1753
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1532 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1533 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1534 1759
1535 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1536 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1537 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1591 \@logins 1816 \@logins
1592} 1817}
1593 1818
1594=item $player->maps 1819=item $player->maps
1595 1820
1821=item cf::player::maps $login
1822
1596Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1597player. May block. 1824player. May block.
1598 1825
1599=cut 1826=cut
1600 1827
1617 } 1844 }
1618 1845
1619 \@paths 1846 \@paths
1620} 1847}
1621 1848
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1850
1624Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1852
1715=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1716 1854
1717Sends an ext reply to the player. 1855Sends an ext reply to the player.
1718 1856
1750 1888
1751=cut 1889=cut
1752 1890
1753sub find_by_path($) { 1891sub find_by_path($) {
1754 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1755 1895
1756 my ($match, $specificity); 1896 my ($match, $specificity);
1757 1897
1758 for my $region (list) { 1898 for my $region (list) {
1759 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1788sub generate_random_map { 1928sub generate_random_map {
1789 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1790 1930
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792 1932
1793 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1802 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1803 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1804 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1805 (cf::region::find $rmp->{region}), $rmp->{custom}
1806 )
1807} 1934}
1808 1935
1809=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1810 1937
1811Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1816 1943
1817sub register { 1944sub register {
1818 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1819 my $pkg = caller; 1946 my $pkg = caller;
1820 1947
1821 no strict;
1822 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1823 1949
1824 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1825} 1951}
1826 1952
1827# also paths starting with '/' 1953# also paths starting with '/'
1828$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1829 1955
1830sub thawer_merge { 1956sub thawer_merge {
1831 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1832 1958
1833 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1838} 1964}
1839 1965
1840sub normalise { 1966sub normalise {
1841 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1842 1968
1843 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1844 1970
1845 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1846 1972
1847 # map plan: 1973 # map plan:
1848 # 1974 #
1863 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1864 $path = "$base/$path"; 1990 $path = "$base/$path";
1865 } 1991 }
1866 1992
1867 for ($path) { 1993 for ($path) {
1868 redo if s{//}{/};
1869 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1870 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1871 } 1996 }
1872 1997
1873 $path 1998 $path
1887 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1888 return $self; 2013 return $self;
1889 } 2014 }
1890 } 2015 }
1891 2016
1892 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1893 () 2018 ()
1894} 2019}
1895 2020
2021# may re-bless or do other evil things
1896sub init { 2022sub init {
1897 my ($self) = @_; 2023 my ($self) = @_;
1898 2024
1899 $self 2025 $self
1900} 2026}
1931 2057
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1934} 2060}
1935 2061
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 2062sub decay_objects {
1946 my ($self) = @_; 2063 my ($self) = @_;
1947 2064
1948 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1949 2066
1974 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1975 2092
1976 1 2093 1
1977} 2094}
1978 2095
2096# used to laod the header of an original map
1979sub load_header_orig { 2097sub load_header_orig {
1980 my ($self) = @_; 2098 my ($self) = @_;
1981 2099
1982 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1983} 2101}
1984 2102
2103# used to laod the header of an instantiated map
1985sub load_header_temp { 2104sub load_header_temp {
1986 my ($self) = @_; 2105 my ($self) = @_;
1987 2106
1988 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1989} 2108}
1990 2109
2110# called after loading the header from an instantiated map
1991sub prepare_temp { 2111sub prepare_temp {
1992 my ($self) = @_; 2112 my ($self) = @_;
1993 2113
1994 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1995 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1996 # safety 2116 # safety
1997 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1998 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1999} 2119}
2000 2120
2121# called after loading the header from an original map
2001sub prepare_orig { 2122sub prepare_orig {
2002 my ($self) = @_; 2123 my ($self) = @_;
2003 2124
2004 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2005 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
2029 2150
2030sub find; 2151sub find;
2031sub find { 2152sub find {
2032 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2033 2154
2155 cf::cede_to_tick;
2156
2034 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2035 2158
2036 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2161
2039 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
2044 or return; 2164 or return;
2045 2165
2046 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2047 2167
2059 2179
2060 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2061 } 2181 }
2062} 2182}
2063 2183
2064sub pre_load { } 2184sub pre_load { }
2065sub post_load { } 2185#sub post_load { } # XS
2066 2186
2067sub load { 2187sub load {
2068 my ($self) = @_; 2188 my ($self) = @_;
2069 2189
2070 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2073 2193
2074 { 2194 {
2075 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2076 2196
2077 return unless $self->valid; 2197 return unless $self->valid;
2078 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2079
2080 $self->in_memory (cf::MAP_LOADING);
2081 2199
2082 $self->alloc; 2200 $self->alloc;
2083 2201
2084 $self->pre_load; 2202 $self->pre_load;
2085 cf::cede_to_tick; 2203 cf::cede_to_tick;
2086 2204
2205 if (exists $self->{load_path}) {
2087 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block; 2207 $f->skip_block;
2089 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2090 or return; 2209 or return;
2091 2210
2092 $self->post_load_original 2211 $self->post_load_original
2093 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2094 2213
2095 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2096 utf8::encode $uniq; 2215 utf8::encode $uniq;
2097 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2099 $self->clear_unique_items; 2218 $self->clear_unique_items;
2100 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2102 } 2222 }
2103 } 2223 }
2104 }
2105 2224
2106 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2107 2232
2108 cf::cede_to_tick; 2233 cf::cede_to_tick;
2109 # now do the right thing for maps 2234 # now do the right thing for maps
2110 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2111 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2114 2239
2115 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2241 $self->decay_objects;
2117 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2118 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2119 cf::cede_to_tick; 2245 cf::cede_to_tick;
2120 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2121 cf::cede_to_tick;
2122 $self->activate;
2123 } 2247 }
2124 2248
2125 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2127
2128 $self->in_memory (cf::MAP_ACTIVE);
2129 } 2251 }
2130 2252
2131 $self->post_load; 2253 $self->post_load;
2132}
2133 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2134sub customise_for { 2261sub customise_for {
2135 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2136 2263
2137 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2265 if $self->per_player;
2154 or next; 2281 or next;
2155 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2156 or next; 2283 or next;
2157 $neigh->load; 2284 $neigh->load;
2158 2285
2286 # now find the diagonal neighbours
2159 push @neigh, 2287 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2290 }
2163 2291
2170} 2298}
2171 2299
2172sub find_sync { 2300sub find_sync {
2173 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2174 2302
2175 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2176} 2308}
2177 2309
2178sub do_load_sync { 2310sub do_load_sync {
2179 my ($map) = @_; 2311 my ($map) = @_;
2180 2312
2313 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2183 2316
2184 cf::sync_job { $map->load }; 2317 $map->load;
2185} 2318}
2186 2319
2187our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2189 2322
2190sub find_async { 2323sub find_async {
2191 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2192 2325
2193 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2194 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2195 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2197 } 2332 }
2198 2333
2199 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2200 2335
2201 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2215 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2216 2351
2217 () 2352 ()
2218} 2353}
2219 2354
2355# common code, used by both ->save and ->swapout
2220sub save { 2356sub _save {
2221 my ($self) = @_; 2357 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2358
2225 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2226 2360
2227 return unless $self->dirty; 2361 return unless $self->dirty;
2228 2362
2248 } else { 2382 } else {
2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2250 } 2384 }
2251} 2385}
2252 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2253sub swap_out { 2395sub swap_out {
2254 my ($self) = @_; 2396 my ($self) = @_;
2255 2397
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2261 return if $self->players; 2402 return if $self->players;
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2263 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2264 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2265 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2266 2454
2267 $self->deactivate; 2455 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear; 2457 $self->clear;
2270}
2271
2272sub reset_at {
2273 my ($self) = @_;
2274
2275 # TODO: safety, remove and allow resettable per-player maps
2276 return 1e99 if $self->{deny_reset};
2277
2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2280
2281 $time + $to
2282}
2283
2284sub should_reset {
2285 my ($self) = @_;
2286
2287 $self->reset_at <= $cf::RUNTIME
2288}
2289
2290sub reset {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 return if $self->players;
2296
2297 warn "resetting map ", $self->path;
2298
2299 $self->in_memory (cf::MAP_SWAPPED);
2300
2301 # need to save uniques path
2302 unless ($self->{deny_save}) {
2303 my $uniq = $self->uniq_path; utf8::encode $uniq;
2304
2305 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2306 if $uniq;
2307 }
2308
2309 delete $cf::MAP{$self->path};
2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2313 $self->clear;
2314 2458
2315 $self->unlink_save; 2459 $self->unlink_save;
2316 $self->destroy; 2460 $self->destroy;
2317} 2461}
2318 2462
2326 2470
2327 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2328 2472
2329 $self->unlink_save; 2473 $self->unlink_save;
2330 2474
2331 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2332 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2333 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2334 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2336 2480
2393 : normalise $_ 2537 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2539 ]
2396} 2540}
2397 2541
2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2573
2398=back 2574=back
2399 2575
2400=head3 cf::object 2576=head3 cf::object
2401 2577
2402=cut 2578=cut
2467 2643
2468our $SAY_CHANNEL = { 2644our $SAY_CHANNEL = {
2469 id => "say", 2645 id => "say",
2470 title => "Map", 2646 title => "Map",
2471 reply => "say ", 2647 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2649};
2474 2650
2475our $CHAT_CHANNEL = { 2651our $CHAT_CHANNEL = {
2476 id => "chat", 2652 id => "chat",
2477 title => "Chat", 2653 title => "Chat",
2532 2708
2533=item $player_object->enter_link 2709=item $player_object->enter_link
2534 2710
2535Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2536 2712
2537The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2539 2717
2540Will never block. 2718Will never block.
2541 2719
2542=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2543 2721
2563sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2564 my ($self) = @_; 2742 my ($self) = @_;
2565 2743
2566 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2567 2745
2746 ++$self->{_link_recursion};
2747
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2749
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2572 2752
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2754}
2575 2755
2576sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2578 2758
2595 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2597 2777
2598 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2601 2781
2602 $map->load; 2782 $map->load;
2603 $map->load_neighbours; 2783 $map->load_neighbours;
2604 2784
2605 return unless $self->contr->active; 2785 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2786
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2610} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2611 2794
2795}
2796
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2798
2614Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2624 2809
2625our $GOTOGEN; 2810our $GOTOGEN;
2626 2811
2627sub cf::object::player::goto { 2812sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2629 2820
2630 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2823
2633 $self->enter_link; 2824 $self->enter_link;
2653 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2654 } 2845 }
2655 } 2846 }
2656 2847
2657 my $map = eval { 2848 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2850
2660 if ($map) { 2851 if ($map) {
2661 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2854 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2856 }
2666 2857
2667 $map 2858 $map
2675 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2678 } 2869 }
2679 2870
2680 $done->() if $done; 2871 $done->($self) if $done;
2681 })->prio (1); 2872 })->prio (1);
2682} 2873}
2683 2874
2684=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2685 2876
2753 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2754 2945
2755 unless (eval { 2946 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2757 2948
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2769 2975
2770 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2771 2977
2772 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2980 if $exit->flag (cf::FLAG_DAMNED);
2775 2981
2776 1 2982 1
2777 }) { 2983 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2988
2783 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2990 $self->leave_link;
2785 } 2991 }
2786 })->prio (1); 2992 })->prio (1);
2787} 2993}
2788 2994
2800sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2802 3008
2803 utf8::encode $text; 3009 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2805} 3036}
2806 3037
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 3039
2809Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2813 3044
2814=cut 3045=cut
2815 3046
2816# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2818 "c/identify" => { 3055 "c/identify" => {
2819 id => "infobox", 3056 id => "infobox",
2820 title => "Identify", 3057 title => "Identify",
2821 reply => undef, 3058 reply => undef,
2822 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2824 "c/examine" => { 3061 "c/examine" => {
2825 id => "infobox", 3062 id => "infobox",
2826 title => "Examine", 3063 title => "Examine",
2827 reply => undef, 3064 reply => undef,
2828 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2829 }, 3072 },
2830 "c/book" => { 3073 "c/book" => {
2831 id => "infobox", 3074 id => "infobox",
2832 title => "Book", 3075 title => "Book",
2833 reply => undef, 3076 reply => undef,
2849 id => "infobox", 3092 id => "infobox",
2850 title => "Body Parts", 3093 title => "Body Parts",
2851 reply => undef, 3094 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2853 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
2854 "c/uptime" => { 3133 "c/uptime" => {
2855 id => "infobox", 3134 id => "infobox",
2856 title => "Uptime", 3135 title => "Uptime",
2857 reply => undef, 3136 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2867 id => "party", 3146 id => "party",
2868 title => "Party", 3147 title => "Party",
2869 reply => "gsay ", 3148 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 3149 tooltip => "Messages and chat related to your party",
2871 }, 3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2872); 3159);
2873 3160
2874sub cf::client::send_msg { 3161sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3163
2877 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2878 3166
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3168
2881 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2884 3172
2885 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2889 3175
2890 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3181 }
2897 3182
2898 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2899 } 3184 }
2900 3185
2901 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2902 3187
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3188 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2907 3191
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3195 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3196
2922 $color &= cf::NDI_COLOR_MASK; 3197 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3198}
2936 3199
2937=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2938 3201
2939Sends an ext event to the client. 3202Sends an ext event to the client.
2942 3205
2943sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2945 3208
2946 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3214 }
2952} 3215}
2953 3216
2954=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2955 3218
2959 3222
2960sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2962 3225
2963 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3229 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3232 }
2970} 3233}
2971 3234
2972=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2973 3236
3044 3307
3045 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3046 if $reply; 3309 if $reply;
3047 3310
3048 } else { 3311 } else {
3049 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3050 } 3313 }
3051 3314
3052 cf::override; 3315 cf::override;
3053 }, 3316 },
3054); 3317);
3074 3337
3075 $coro 3338 $coro
3076} 3339}
3077 3340
3078cf::client->attach ( 3341cf::client->attach (
3079 on_destroy => sub { 3342 on_client_destroy => sub {
3080 my ($ns) = @_; 3343 my ($ns) = @_;
3081 3344
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3346 },
3084); 3347);
3100our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3101 3364
3102$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3103 3366
3104$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3107 sort time 3370 sort time
3108)); 3371));
3109 3372
3110# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3115 3378
3116 cf::object 3379 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3381 insert remove name archname title slaying race decrease split
3382 value
3119 3383
3120 cf::object::player 3384 cf::object::player
3121 player 3385 player
3122 3386
3123 cf::player 3387 cf::player
3129=cut 3393=cut
3130 3394
3131for ( 3395for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3138) { 3402) {
3139 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3142 for @funs; 3405 for @funs;
3143} 3406}
3144 3407
3159 3422
3160 my $qcode = $code; 3423 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3163 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3164 local $_; 3430 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3431
3167 my $eval = 3432 my $eval =
3168 "do {\n" 3433 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3436 . $code
3172 . "\n}" 3437 . "\n}"
3173 ; 3438 ;
3174 3439
3440 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3178 3449
3179 if ($@) { 3450 if ($@) {
3180 warn "$@"; 3451 warn "$@",
3181 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3183 } 3454 }
3184 3455
3185 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3186} 3457}
3187 3458
3201=cut 3472=cut
3202 3473
3203sub register_script_function { 3474sub register_script_function {
3204 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3205 3476
3206 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3208} 3479}
3209 3480
3210=back 3481=back
3211 3482
3212=cut 3483=cut
3221 # for this (global event?) 3492 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3223 3494
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225 3496
3226 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3227 3498
3228 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3229 0 < aio_load $path, $facedata
3230 or die "$path: $!";
3231
3232 $facedata = Coro::Storable::thaw $facedata;
3233 3500
3234 $facedata->{version} == 2 3501 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3503
3237 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3238 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3507 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3241 }; 3510 };
3242 cf::cede_to_tick; 3511 cf::cede_to_tick;
3243 3512
3244 { 3513 {
3245 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3518
3250 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3254 3524
3255 cf::cede_to_tick; 3525 cf::cede_to_tick;
3256 } 3526 }
3257 3527
3258 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3263 3533
3264 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3267 } else { 3537 } else {
3268 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3269 } 3539 }
3270 3540
3271 cf::cede_to_tick; 3541 cf::cede_to_tick;
3272 } 3542 }
3273 } 3543 }
3282 3552
3283 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3284 } 3554 }
3285 3555
3286 { 3556 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3290 3558
3291 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3562
3296 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3311 } else { 3565 } else {
3312 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3313 } 3567 }
3314 3568
3315 cf::cede_to_tick; 3569 cf::cede_to_tick;
3316 } 3570 }
3317 } 3571 }
3318 3572
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320 3574
3321 1 3575 1
3322} 3576}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343 3577
3344register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3346 3580
3347 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3386sub reload_treasures { 3620sub reload_treasures {
3387 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3388 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3389} 3623}
3390 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3391sub reload_resources { 3645sub reload_resources {
3392 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3393 3647
3648 reload_exp_table;
3649 reload_materials;
3394 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3395 reload_archetypes; 3652 reload_archetypes;
3396 reload_regions; 3653 reload_regions;
3397 reload_treasures; 3654 reload_treasures;
3398 3655
3399 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3400}
3401
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408} 3657}
3409 3658
3410sub reload_config { 3659sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3412 or return;
3413 3661
3414 local $/; 3662 my $config = load_file "$CONFDIR/config";
3415 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3416 3665
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3418 3667
3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3421 3670
3422 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3426 }; 3675 };
3427 warn $@ if $@; 3676 warn $@ if $@;
3428 } 3677 }
3429} 3678}
3430 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3431sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3432 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3721 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3439 }; 3725 };
3440 3726
3441 { 3727 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3443 reload_config; 3739 reload_config;
3444 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3445 load_extensions; 3750 load_extensions;
3446 3751
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3752 utime time, time, $RUNTIMEFILE;
3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3448 } 3759 };
3449 3760
3450 EV::loop; 3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3451} 3770}
3452 3771
3453############################################################################# 3772#############################################################################
3454# initialisation and cleanup 3773# initialisation and cleanup
3455 3774
3456# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3457BEGIN { 3776BEGIN {
3458 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3462 }; 3781 };
3463 } 3782 }
3464} 3783}
3465 3784
3466sub write_runtime_sync { 3785sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3468 3787
3469 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3471 3790
3472 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3792
3474 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3475 3794
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3796 or return;
3478 3797
3479 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3492 3811
3493 close $fh 3812 close $fh
3494 or return; 3813 or return;
3495 3814
3496 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3816 and return;
3498 3817
3499 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3819
3501 1 3820 1
3502} 3821}
3503 3822
3504our $uuid_lock; 3823our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3514 3833
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3835 or return;
3517 3836
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3845 $uuid_skip = 0;
3520 3846
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3848 and return;
3523 3849
3529 or return; 3855 or return;
3530 3856
3531 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3532 and return; 3858 and return;
3533 3859
3534 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3535 3861
3536 1 3862 1
3537 3863
3538} 3864}
3539 3865
3545} 3871}
3546 3872
3547sub emergency_save() { 3873sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3549 3875
3550 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3551 3882
3552 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3553 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3892 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3894 $pl->save;
3562 } 3895 }
3563 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3564 3897
3565 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3903 $map->valid or next;
3569 $map->save; 3904 $map->save;
3570 } 3905 }
3571 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3572 3907
3573 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3576 3913
3577 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3915 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3580 }; 3936 };
3581 3937
3582 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3583} 3939}
3584 3940
3585sub post_cleanup { 3941sub post_cleanup {
3586 my ($make_core) = @_; 3942 my ($make_core) = @_;
3587 3943
3944 IO::AIO::flush;
3945
3588 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3590} 3976}
3591 3977
3592sub do_reload_perl() { 3978sub do_reload_perl() {
3593 # can/must only be called in main 3979 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3595 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3596 return; 3982 return;
3597 } 3983 }
3598 3984
3599 warn "reloading..."; 3985 return if $RELOAD++;
3600 3986
3601 warn "entering sync_job"; 3987 my $t1 = AE::time;
3602 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3603 cf::sync_job { 3995 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3996 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 3997
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs;
3619 warn "iterate...";
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = (); 4000 %EXT_CORO = ();
3627 4001
3628 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3629 %COMMAND = (); 4003 %COMMAND = ();
3630 4004
3631 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3632 %EXTCMD = (); 4006 %EXTCMD = ();
3633 %EXTICMD = (); 4007 %EXTICMD = ();
3634 4008
3635 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3636 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3638 4012
3639 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3640 eval { 4014 eval {
3641 $cb->($pkg); 4015 $cb->($pkg);
3642 1 4016 1
3643 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3644 } 4022 }
3645 4023
3646 warn "... nuking $pkg";
3647 Symbol::delete_package $pkg;
3648 }
3649
3650 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3651 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 4027
3654 warn "... unloading $k"; 4028 trace "... unloading $k";
3655 delete $INC{$k}; 4029 delete $INC{$k};
3656 4030
3657 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3659 4033
3660 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3661 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3662 } 4039 }
3663 4040
3664 Symbol::delete_package $k;
3665 }
3666
3667 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 4044
3671 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 4048
3675 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3676 # and global variables created in xs 4050 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3678 4052
3679 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3680 4054
3681 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3682 require cf; 4056 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3684 4058
3685 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3686 cf::reload_config; 4060 cf::reload_config;
3687 4061
3688 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3689 cf::load_extensions; 4063 cf::load_extensions;
3690 4064
4065 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3694 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3697 4073
3698 warn "leaving sync_job"; 4074 cf::_post_init 1;
3699 4075
4076 trace "perl_reload: leaving sync_job";
4077
3700 1 4078 1
3701 } or do { 4079 } or do {
3702 warn $@; 4080 error $@;
3703 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
4082 };
4083
4084 --$RELOAD;
3704 }; 4085 }
3705 4086
3706 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3707}; 4089};
3708 4090
3709our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3710 4092
3711sub reload_perl() { 4093sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3714 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 4101 do_reload_perl;
3717 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3718 }; 4104 };
3719} 4105}
3720 4106
3721register_command "reload" => sub { 4107register_command "reload" => sub {
3722 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3728 reload_perl; 4114 reload_perl;
3729 }; 4115 };
3730 } 4116 }
3731}; 4117};
3732 4118
3733unshift @INC, $LIBDIR; 4119#############################################################################
3734 4120
3735my $bug_warning = 0; 4121my $bug_warning = 0;
3736 4122
3737our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN;
3739
3740sub wait_for_tick { 4123sub wait_for_tick() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3742 4125
3743 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3744 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait;
3746} 4127}
3747 4128
3748sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3750 4131
3751 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 4134 $signal->wait;
3754} 4135}
3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3759 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3760 return; 4141 return;
3761 } 4142 }
3762 4143
3763 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3764 4147
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3767 Coro::async_pool { 4150 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3769 write_runtime_sync 4152 write_runtime_sync
3770 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3771 }; 4154 };
3772 } 4155 }
3773 4156
3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3775 $sig->send; 4158 $sig->send;
3776 } 4159 }
3777 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3778 $sig->send;
3779 }
3780 4161
3781 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3783 4164
3784 if (0) { 4165 if (0) {
3785 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3789 } 4170 }
3790 } 4171 }
3791} 4172}
3792 4173
3793{ 4174{
3794 # configure BDB 4175 # configure BDB
3795 4176
3796 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3799 4180
3800 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3838 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3839 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3840 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
3841} 4222}
3842 4223
3843my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3844 4226
3845sub _log_backtrace { 4227sub _log_backtrace {
3846 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3847 4229
3848 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3849 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3850 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3852 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3853 async { 4240 async {
3854 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3855 4242
3856 my @bt = fork_call { 4243 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4255 }
3869 4256
3870 @funcs 4257 @funcs
3871 }; 4258 };
3872 4259
3873 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4263 --$_log_backtrace;
3876 }; 4264 };
3877 } else { 4265 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3880 } 4268 }
3881} 4269}
3882 4270
3883# load additional modules 4271# load additional modules
3884use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3885 4274
3886END { cf::emergency_save } 4275END { cf::emergency_save }
3887 4276
38881 42771
3889 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines