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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines