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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.571 by root, Wed May 4 19:04:45 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; 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->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 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)
2113 2239
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;
2244 $self->post_load_physics;
2118 cf::cede_to_tick; 2245 cf::cede_to_tick;
2119 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2120 cf::cede_to_tick;
2121 $self->activate;
2122 } 2247 }
2123 2248
2124 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2126
2127 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2251 }
2129 2252
2130 $self->post_load; 2253 $self->post_load;
2131}
2132 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2133sub customise_for { 2261sub customise_for {
2134 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2135 2263
2136 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2265 if $self->per_player;
2153 or next; 2281 or next;
2154 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2155 or next; 2283 or next;
2156 $neigh->load; 2284 $neigh->load;
2157 2285
2286 # now find the diagonal neighbours
2158 push @neigh, 2287 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2290 }
2162 2291
2169} 2298}
2170 2299
2171sub find_sync { 2300sub find_sync {
2172 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2173 2302
2174 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2175} 2308}
2176 2309
2177sub do_load_sync { 2310sub do_load_sync {
2178 my ($map) = @_; 2311 my ($map) = @_;
2179 2312
2313 # it's a bug to call this from the main context
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2182 2316
2183 cf::sync_job { $map->load }; 2317 $map->load;
2184} 2318}
2185 2319
2186our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2188 2322
2189sub find_async { 2323sub find_async {
2190 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2191 2325
2192 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2193 2327
2194 if (my $map = $cf::MAP{$path}) { 2328 if (my $map = $cf::MAP{$path}) {
2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2329 return $map if !$load || $map->linkable;
2196 } 2330 }
2197 2331
2198 $MAP_PREFETCH{$path} |= $load; 2332 $MAP_PREFETCH{$path} |= $load;
2199 2333
2200 $MAP_PREFETCHER ||= cf::async { 2334 $MAP_PREFETCHER ||= cf::async {
2214 $MAP_PREFETCHER->prio (6); 2348 $MAP_PREFETCHER->prio (6);
2215 2349
2216 () 2350 ()
2217} 2351}
2218 2352
2353# common code, used by both ->save and ->swapout
2219sub save { 2354sub _save {
2220 my ($self) = @_; 2355 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2356
2224 $self->{last_save} = $cf::RUNTIME; 2357 $self->{last_save} = $cf::RUNTIME;
2225 2358
2226 return unless $self->dirty; 2359 return unless $self->dirty;
2227 2360
2247 } else { 2380 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2381 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2382 }
2250} 2383}
2251 2384
2385sub save {
2386 my ($self) = @_;
2387
2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389
2390 $self->_save;
2391}
2392
2252sub swap_out { 2393sub swap_out {
2253 my ($self) = @_; 2394 my ($self) = @_;
2254 2395
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2396 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2397
2398 return if !$self->linkable;
2399 return if $self->{deny_save};
2260 return if $self->players; 2400 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2401
2402 # first deactivate the map and "unlink" it from the core
2403 $self->deactivate;
2404 $_->clear_links_to ($self) for values %cf::MAP;
2405 $self->state (cf::MAP_SWAPPED);
2406
2407 # then atomically save
2408 $self->_save;
2409
2410 # then free the map
2411 $self->clear;
2412}
2413
2414sub reset_at {
2415 my ($self) = @_;
2416
2417 # TODO: safety, remove and allow resettable per-player maps
2262 return if $self->{deny_save}; 2418 return 1e99 if $self->{deny_reset};
2263 2419
2420 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2421 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2422
2423 $time + $to
2424}
2425
2426sub should_reset {
2427 my ($self) = @_;
2428
2429 $self->reset_at <= $cf::RUNTIME
2430}
2431
2432sub reset {
2433 my ($self) = @_;
2434
2435 my $lock = cf::lock_acquire "map_data:$self->{path}";
2436
2437 return if $self->players;
2438
2439 cf::trace "resetting map ", $self->path, "\n";
2440
2264 $self->in_memory (cf::MAP_SWAPPED); 2441 $self->state (cf::MAP_SWAPPED);
2442
2443 # need to save uniques path
2444 unless ($self->{deny_save}) {
2445 my $uniq = $self->uniq_path; utf8::encode $uniq;
2446
2447 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2448 if $uniq;
2449 }
2450
2451 delete $cf::MAP{$self->path};
2265 2452
2266 $self->deactivate; 2453 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2454 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2455 $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 2456
2314 $self->unlink_save; 2457 $self->unlink_save;
2315 $self->destroy; 2458 $self->destroy;
2316} 2459}
2317 2460
2325 2468
2326 delete $cf::MAP{$self->path}; 2469 delete $cf::MAP{$self->path};
2327 2470
2328 $self->unlink_save; 2471 $self->unlink_save;
2329 2472
2330 bless $self, "cf::map"; 2473 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2474 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2475 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2476 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2477 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2478
2392 : normalise $_ 2535 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2536 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2537 ]
2395} 2538}
2396 2539
2540=item cf::map::static_maps
2541
2542Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2543file in the shared directory excluding F</styles> and F</editor>). May
2544block.
2545
2546=cut
2547
2548sub static_maps() {
2549 my @dirs = "";
2550 my @maps;
2551
2552 while (@dirs) {
2553 my $dir = shift @dirs;
2554
2555 next if $dir eq "/styles" || $dir eq "/editor";
2556
2557 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2558 or return;
2559
2560 for (@$files) {
2561 s/\.map$// or next;
2562 utf8::decode $_;
2563 push @maps, "$dir/$_";
2564 }
2565
2566 push @dirs, map "$dir/$_", @$dirs;
2567 }
2568
2569 \@maps
2570}
2571
2397=back 2572=back
2398 2573
2399=head3 cf::object 2574=head3 cf::object
2400 2575
2401=cut 2576=cut
2466 2641
2467our $SAY_CHANNEL = { 2642our $SAY_CHANNEL = {
2468 id => "say", 2643 id => "say",
2469 title => "Map", 2644 title => "Map",
2470 reply => "say ", 2645 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2646 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2647};
2473 2648
2474our $CHAT_CHANNEL = { 2649our $CHAT_CHANNEL = {
2475 id => "chat", 2650 id => "chat",
2476 title => "Chat", 2651 title => "Chat",
2531 2706
2532=item $player_object->enter_link 2707=item $player_object->enter_link
2533 2708
2534Freezes the player and moves him/her to a special map (C<{link}>). 2709Freezes the player and moves him/her to a special map (C<{link}>).
2535 2710
2536The player should be reasonably safe there for short amounts of time. You 2711The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2712for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2713though, as the player cannot control the character while it is on the link
2714map.
2538 2715
2539Will never block. 2716Will never block.
2540 2717
2541=item $player_object->leave_link ($map, $x, $y) 2718=item $player_object->leave_link ($map, $x, $y)
2542 2719
2562sub cf::object::player::enter_link { 2739sub cf::object::player::enter_link {
2563 my ($self) = @_; 2740 my ($self) = @_;
2564 2741
2565 $self->deactivate_recursive; 2742 $self->deactivate_recursive;
2566 2743
2744 ++$self->{_link_recursion};
2745
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2746 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2747
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2749 if $self->map && $self->map->{path} ne "{link}";
2571 2750
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2751 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2752}
2574 2753
2575sub cf::object::player::leave_link { 2754sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2755 my ($self, $map, $x, $y) = @_;
2577 2756
2594 ($x, $y) = (-1, -1) 2773 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2774 unless (defined $x) && (defined $y);
2596 2775
2597 # use -1 or undef as default coordinates, not 0, 0 2776 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2777 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2778 if $x <= 0 && $y <= 0;
2600 2779
2601 $map->load; 2780 $map->load;
2602 $map->load_neighbours; 2781 $map->load_neighbours;
2603 2782
2604 return unless $self->contr->active; 2783 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2784
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2785 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2786 if ($self->enter_map ($map, $x, $y)) {
2609} 2787 # entering was successful
2788 delete $self->{_link_recursion};
2789 # only activate afterwards, to support waiting in hooks
2790 $self->activate_recursive;
2791 }
2610 2792
2793}
2794
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2795=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2796
2613Moves the player to the given map-path and coordinates by first freezing 2797Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2798her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2799that 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 2800the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2801be called at the end of this process.
2618 2802
2803Note that $check will be called with a potentially non-loaded map, so if
2804it needs a loaded map it has to call C<< ->load >>.
2805
2619=cut 2806=cut
2620 2807
2621our $GOTOGEN; 2808our $GOTOGEN;
2622 2809
2623sub cf::object::player::goto { 2810sub cf::object::player::goto {
2624 my ($self, $path, $x, $y, $check, $done) = @_; 2811 my ($self, $path, $x, $y, $check, $done) = @_;
2812
2813 if ($self->{_link_recursion} >= $MAX_LINKS) {
2814 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2815 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2816 ($path, $x, $y) = @$EMERGENCY_POSITION;
2817 }
2625 2818
2626 # do generation counting so two concurrent goto's will be executed in-order 2819 # do generation counting so two concurrent goto's will be executed in-order
2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2820 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2628 2821
2629 $self->enter_link; 2822 $self->enter_link;
2649 ($path, $x, $y) = (undef, undef, undef); 2842 ($path, $x, $y) = (undef, undef, undef);
2650 } 2843 }
2651 } 2844 }
2652 2845
2653 my $map = eval { 2846 my $map = eval {
2654 my $map = defined $path ? cf::map::find $path : undef; 2847 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2655 2848
2656 if ($map) { 2849 if ($map) {
2657 $map = $map->customise_for ($self); 2850 $map = $map->customise_for ($self);
2658 $map = $check->($map) if $check && $map; 2851 $map = $check->($map, $x, $y, $self) if $check && $map;
2659 } else { 2852 } else {
2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2853 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2661 } 2854 }
2662 2855
2663 $map 2856 $map
2671 if ($gen == $self->{_goto_generation}) { 2864 if ($gen == $self->{_goto_generation}) {
2672 delete $self->{_goto_generation}; 2865 delete $self->{_goto_generation};
2673 $self->leave_link ($map, $x, $y); 2866 $self->leave_link ($map, $x, $y);
2674 } 2867 }
2675 2868
2676 $done->() if $done; 2869 $done->($self) if $done;
2677 })->prio (1); 2870 })->prio (1);
2678} 2871}
2679 2872
2680=item $player_object->enter_exit ($exit_object) 2873=item $player_object->enter_exit ($exit_object)
2681 2874
2749 $Coro::current->{desc} = "enter_exit"; 2942 $Coro::current->{desc} = "enter_exit";
2750 2943
2751 unless (eval { 2944 unless (eval {
2752 $self->deactivate_recursive; # just to be sure 2945 $self->deactivate_recursive; # just to be sure
2753 2946
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2763 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2950
2951 # special map handling
2952 my $slaying = $exit->slaying;
2953
2954 # special map handling
2955 if ($slaying eq "/!") {
2956 my $guard = cf::lock_acquire "exit_prepare:$exit";
2957
2958 prepare_random_map $exit
2959 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2960
2961 $map = $exit->slaying;
2962
2963 } elsif ($slaying eq '!up') {
2964 $map = $exit->map->tile_path (cf::TILE_UP);
2965 $x = $exit->x;
2966 $y = $exit->y;
2967
2968 } elsif ($slaying eq '!down') {
2969 $map = $exit->map->tile_path (cf::TILE_DOWN);
2970 $x = $exit->x;
2971 $y = $exit->y;
2972 }
2765 2973
2766 $self->goto ($map, $x, $y); 2974 $self->goto ($map, $x, $y);
2767 2975
2768 # if exit is damned, update players death & WoR home-position 2976 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y) 2977 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2978 if $exit->flag (cf::FLAG_DAMNED);
2771 2979
2772 1 2980 1
2773 }) { 2981 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2982 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2983 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2984 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2985 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2986
2779 warn "ERROR in enter_exit: $@"; 2987 error "ERROR in enter_exit: $@";
2780 $self->leave_link; 2988 $self->leave_link;
2781 } 2989 }
2782 })->prio (1); 2990 })->prio (1);
2783} 2991}
2784 2992
2796sub cf::client::send_drawinfo { 3004sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 3005 my ($self, $text, $flags) = @_;
2798 3006
2799 utf8::encode $text; 3007 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3008 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3009}
3010
3011=item $client->send_big_packet ($pkt)
3012
3013Like C<send_packet>, but tries to compress large packets, and fragments
3014them as required.
3015
3016=cut
3017
3018our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3019
3020sub cf::client::send_big_packet {
3021 my ($self, $pkt) = @_;
3022
3023 # try lzf for large packets
3024 $pkt = "lzf " . Compress::LZF::compress $pkt
3025 if 1024 <= length $pkt and $self->{can_lzf};
3026
3027 # split very large packets
3028 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3029 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3030 $pkt = "frag";
3031 }
3032
3033 $self->send_packet ($pkt);
2801} 3034}
2802 3035
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 3036=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 3037
2805Send a drawinfo or msg packet to the client, formatting the msg for the 3038Send a drawinfo or msg packet to the client, formatting the msg for the
2809 3042
2810=cut 3043=cut
2811 3044
2812# non-persistent channels (usually the info channel) 3045# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 3046our %CHANNEL = (
3047 "c/motd" => {
3048 id => "infobox",
3049 title => "MOTD",
3050 reply => undef,
3051 tooltip => "The message of the day",
3052 },
2814 "c/identify" => { 3053 "c/identify" => {
2815 id => "infobox", 3054 id => "infobox",
2816 title => "Identify", 3055 title => "Identify",
2817 reply => undef, 3056 reply => undef,
2818 tooltip => "Items recently identified", 3057 tooltip => "Items recently identified",
2820 "c/examine" => { 3059 "c/examine" => {
2821 id => "infobox", 3060 id => "infobox",
2822 title => "Examine", 3061 title => "Examine",
2823 reply => undef, 3062 reply => undef,
2824 tooltip => "Signs and other items you examined", 3063 tooltip => "Signs and other items you examined",
3064 },
3065 "c/shopinfo" => {
3066 id => "infobox",
3067 title => "Shop Info",
3068 reply => undef,
3069 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 3070 },
2826 "c/book" => { 3071 "c/book" => {
2827 id => "infobox", 3072 id => "infobox",
2828 title => "Book", 3073 title => "Book",
2829 reply => undef, 3074 reply => undef,
2845 id => "infobox", 3090 id => "infobox",
2846 title => "Body Parts", 3091 title => "Body Parts",
2847 reply => undef, 3092 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 3093 tooltip => "Shows which body parts you posess and are available",
2849 }, 3094 },
3095 "c/statistics" => {
3096 id => "infobox",
3097 title => "Statistics",
3098 reply => undef,
3099 tooltip => "Shows your primary statistics",
3100 },
3101 "c/skills" => {
3102 id => "infobox",
3103 title => "Skills",
3104 reply => undef,
3105 tooltip => "Shows your experience per skill and item power",
3106 },
3107 "c/shopitems" => {
3108 id => "infobox",
3109 title => "Shop Items",
3110 reply => undef,
3111 tooltip => "Shows the items currently for sale in this shop",
3112 },
3113 "c/resistances" => {
3114 id => "infobox",
3115 title => "Resistances",
3116 reply => undef,
3117 tooltip => "Shows your resistances",
3118 },
3119 "c/pets" => {
3120 id => "infobox",
3121 title => "Pets",
3122 reply => undef,
3123 tooltip => "Shows information abotu your pets/a specific pet",
3124 },
3125 "c/perceiveself" => {
3126 id => "infobox",
3127 title => "Perceive Self",
3128 reply => undef,
3129 tooltip => "You gained detailed knowledge about yourself",
3130 },
2850 "c/uptime" => { 3131 "c/uptime" => {
2851 id => "infobox", 3132 id => "infobox",
2852 title => "Uptime", 3133 title => "Uptime",
2853 reply => undef, 3134 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 3135 tooltip => "How long the server has been running since last restart",
2863 id => "party", 3144 id => "party",
2864 title => "Party", 3145 title => "Party",
2865 reply => "gsay ", 3146 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 3147 tooltip => "Messages and chat related to your party",
2867 }, 3148 },
3149 "c/death" => {
3150 id => "death",
3151 title => "Death",
3152 reply => undef,
3153 tooltip => "Reason for and more info about your most recent death",
3154 },
3155 "c/say" => $SAY_CHANNEL,
3156 "c/chat" => $CHAT_CHANNEL,
2868); 3157);
2869 3158
2870sub cf::client::send_msg { 3159sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 3160 my ($self, $channel, $msg, $color, @extra) = @_;
2872 3161
2873 $msg = $self->pl->expand_cfpod ($msg); 3162 $msg = $self->pl->expand_cfpod ($msg)
3163 unless $color & cf::NDI_VERBATIM;
2874 3164
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 3165 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 3166
2877 # check predefined channels, for the benefit of C 3167 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 3168 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 3169 $channel = $CHANNEL{$channel};
2880 3170
2881 $self->ext_msg (channel_info => $channel) 3171 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 3172 $channel = $channel->{id};
2885 3173
2886 } elsif (ref $channel) { 3174 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 3175 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 3176 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 3177 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 3178 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 3179 }
2893 3180
2894 $channel = $channel->{id}; 3181 $channel = $channel->{id};
2895 } 3182 }
2896 3183
2897 return unless @extra || length $msg; 3184 return unless @extra || length $msg;
2898 3185
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3186 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3187 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3188 if $color & cf::NDI_DEF;
2903 3189
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3190 my $pkt = "msg "
3191 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3192 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3193 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3194
2918 $color &= cf::NDI_COLOR_MASK; 3195 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3196}
2932 3197
2933=item $client->ext_msg ($type, @msg) 3198=item $client->ext_msg ($type, @msg)
2934 3199
2935Sends an ext event to the client. 3200Sends an ext event to the client.
2938 3203
2939sub cf::client::ext_msg($$@) { 3204sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3205 my ($self, $type, @msg) = @_;
2941 3206
2942 if ($self->extcmd == 2) { 3207 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3208 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3209 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3210 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3211 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3212 }
2948} 3213}
2949 3214
2950=item $client->ext_reply ($msgid, @msg) 3215=item $client->ext_reply ($msgid, @msg)
2951 3216
2955 3220
2956sub cf::client::ext_reply($$@) { 3221sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3222 my ($self, $id, @msg) = @_;
2958 3223
2959 if ($self->extcmd == 2) { 3224 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3225 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3226 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3227 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3228 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3229 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3230 }
2966} 3231}
2967 3232
2968=item $success = $client->query ($flags, "text", \&cb) 3233=item $success = $client->query ($flags, "text", \&cb)
2969 3234
3040 3305
3041 $ns->ext_reply ($reply, @reply) 3306 $ns->ext_reply ($reply, @reply)
3042 if $reply; 3307 if $reply;
3043 3308
3044 } else { 3309 } else {
3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3310 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3046 } 3311 }
3047 3312
3048 cf::override; 3313 cf::override;
3049 }, 3314 },
3050); 3315);
3070 3335
3071 $coro 3336 $coro
3072} 3337}
3073 3338
3074cf::client->attach ( 3339cf::client->attach (
3075 on_destroy => sub { 3340 on_client_destroy => sub {
3076 my ($ns) = @_; 3341 my ($ns) = @_;
3077 3342
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3343 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3344 },
3080); 3345);
3096our $safe_hole = new Safe::Hole; 3361our $safe_hole = new Safe::Hole;
3097 3362
3098$SIG{FPE} = 'IGNORE'; 3363$SIG{FPE} = 'IGNORE';
3099 3364
3100$safe->permit_only (Opcode::opset qw( 3365$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3366 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3367 grepstart grepwhile mapstart mapwhile
3103 sort time 3368 sort time
3104)); 3369));
3105 3370
3106# here we export the classes and methods available to script code 3371# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3375The following functions and methods are available within a safe environment:
3111 3376
3112 cf::object 3377 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3378 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3379 insert remove name archname title slaying race decrease split
3380 value
3115 3381
3116 cf::object::player 3382 cf::object::player
3117 player 3383 player
3118 3384
3119 cf::player 3385 cf::player
3125=cut 3391=cut
3126 3392
3127for ( 3393for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3394 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3395 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3396 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3397 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3398 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3399 ["cf::map" => qw(trigger)],
3134) { 3400) {
3135 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3401 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3402 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3138 for @funs; 3403 for @funs;
3139} 3404}
3140 3405
3155 3420
3156 my $qcode = $code; 3421 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3422 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3423 $qcode =~ s/\n/\\n/g;
3159 3424
3425 %vars = (_dummy => 0) unless %vars;
3426
3427 my @res;
3160 local $_; 3428 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3429
3163 my $eval = 3430 my $eval =
3164 "do {\n" 3431 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3432 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3433 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3434 . $code
3168 . "\n}" 3435 . "\n}"
3169 ; 3436 ;
3170 3437
3438 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3439 sub_generation_inc;
3440 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3441 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3442 sub_generation_inc;
3443 } else {
3444 local @cf::_safe_eval_args = values %vars;
3445 @res = wantarray ? eval eval : scalar eval $eval;
3446 }
3174 3447
3175 if ($@) { 3448 if ($@) {
3176 warn "$@"; 3449 warn "$@",
3177 warn "while executing safe code '$code'\n"; 3450 "while executing safe code '$code'\n",
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3451 "with arguments " . (join " ", %vars) . "\n";
3179 } 3452 }
3180 3453
3181 wantarray ? @res : $res[0] 3454 wantarray ? @res : $res[0]
3182} 3455}
3183 3456
3197=cut 3470=cut
3198 3471
3199sub register_script_function { 3472sub register_script_function {
3200 my ($fun, $cb) = @_; 3473 my ($fun, $cb) = @_;
3201 3474
3202 no strict 'refs'; 3475 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3476 *$fun = $safe_hole->wrap ($cb);
3204} 3477}
3205 3478
3206=back 3479=back
3207 3480
3208=cut 3481=cut
3217 # for this (global event?) 3490 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = (); 3491 %ext::player_env::MUSIC_FACE_CACHE = ();
3219 3492
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3493 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221 3494
3222 warn "loading facedata from $path\n"; 3495 trace "loading facedata from $path\n";
3223 3496
3224 my $facedata; 3497 my $facedata = decode_storable load_file $path;
3225 0 < aio_load $path, $facedata
3226 or die "$path: $!";
3227
3228 $facedata = Coro::Storable::thaw $facedata;
3229 3498
3230 $facedata->{version} == 2 3499 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3500 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3501
3233 # patch in the exptable 3502 # patch in the exptable
3503 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3504 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3505 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3506 data => $exp_table,
3507 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3508 };
3238 cf::cede_to_tick; 3509 cf::cede_to_tick;
3239 3510
3240 { 3511 {
3241 my $faces = $facedata->{faceinfo}; 3512 my $faces = $facedata->{faceinfo};
3243 while (my ($face, $info) = each %$faces) { 3514 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3515 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3516
3246 cf::face::set_visibility $idx, $info->{visibility}; 3517 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3518 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3519 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3520 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3521 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3250 3522
3251 cf::cede_to_tick; 3523 cf::cede_to_tick;
3252 } 3524 }
3253 3525
3254 while (my ($face, $info) = each %$faces) { 3526 while (my ($face, $info) = each %$faces) {
3259 3531
3260 if (my $smooth = cf::face::find $info->{smooth}) { 3532 if (my $smooth = cf::face::find $info->{smooth}) {
3261 cf::face::set_smooth $idx, $smooth; 3533 cf::face::set_smooth $idx, $smooth;
3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3534 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3263 } else { 3535 } else {
3264 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3536 error "smooth face '$info->{smooth}' not found for face '$face'";
3265 } 3537 }
3266 3538
3267 cf::cede_to_tick; 3539 cf::cede_to_tick;
3268 } 3540 }
3269 } 3541 }
3278 3550
3279 cf::anim::invalidate_all; # d'oh 3551 cf::anim::invalidate_all; # d'oh
3280 } 3552 }
3281 3553
3282 { 3554 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3555 my $res = $facedata->{resource};
3286 3556
3287 while (my ($name, $info) = each %$res) { 3557 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3558 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3560
3292 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $info->{type};
3307 } else { 3563 } else {
3308 $RESOURCE{$name} = $info; 3564 $RESOURCE{$name} = $info; # unused
3309 } 3565 }
3310 3566
3311 cf::cede_to_tick; 3567 cf::cede_to_tick;
3312 } 3568 }
3313 } 3569 }
3314 3570
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3571 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3316 3572
3317 1 3573 1
3318} 3574}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3339 3575
3340register_exticmd fx_want => sub { 3576register_exticmd fx_want => sub {
3341 my ($ns, $want) = @_; 3577 my ($ns, $want) = @_;
3342 3578
3343 while (my ($k, $v) = each %$want) { 3579 while (my ($k, $v) = each %$want) {
3382sub reload_treasures { 3618sub reload_treasures {
3383 load_resource_file "$DATADIR/treasures" 3619 load_resource_file "$DATADIR/treasures"
3384 or die "unable to load treasurelists\n"; 3620 or die "unable to load treasurelists\n";
3385} 3621}
3386 3622
3623sub reload_sound {
3624 trace "loading sound config from $DATADIR/sound\n";
3625
3626 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3627
3628 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3629 my $sound = $soundconf->{compat}[$_]
3630 or next;
3631
3632 my $face = cf::face::find "sound/$sound->[1]";
3633 cf::sound::set $sound->[0] => $face;
3634 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3635 }
3636
3637 while (my ($k, $v) = each %{$soundconf->{event}}) {
3638 my $face = cf::face::find "sound/$v";
3639 cf::sound::set $k => $face;
3640 }
3641}
3642
3387sub reload_resources { 3643sub reload_resources {
3388 warn "reloading resource files...\n"; 3644 trace "reloading resource files...\n";
3389 3645
3646 reload_exp_table;
3647 reload_materials;
3390 reload_facedata; 3648 reload_facedata;
3649 reload_sound;
3391 reload_archetypes; 3650 reload_archetypes;
3392 reload_regions; 3651 reload_regions;
3393 reload_treasures; 3652 reload_treasures;
3394 3653
3395 warn "finished reloading resource files\n"; 3654 trace "finished reloading resource files\n";
3396}
3397
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404} 3655}
3405 3656
3406sub reload_config { 3657sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3658 trace "reloading config file...\n";
3408 or return;
3409 3659
3410 local $/; 3660 my $config = load_file "$CONFDIR/config";
3411 *CFG = YAML::Load <$fh>; 3661 utf8::decode $config;
3662 *CFG = decode_yaml $config;
3412 3663
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3664 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3665
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3666 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3667 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3668
3418 if (exists $CFG{mlockall}) { 3669 if (exists $CFG{mlockall}) {
3422 }; 3673 };
3423 warn $@ if $@; 3674 warn $@ if $@;
3424 } 3675 }
3425} 3676}
3426 3677
3678sub pidfile() {
3679 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3680 or die "$PIDFILE: $!";
3681 flock $fh, &Fcntl::LOCK_EX
3682 or die "$PIDFILE: flock: $!";
3683 $fh
3684}
3685
3686# make sure only one server instance is running at any one time
3687sub atomic {
3688 my $fh = pidfile;
3689
3690 my $pid = <$fh>;
3691 kill 9, $pid if $pid > 0;
3692
3693 seek $fh, 0, 0;
3694 print $fh $$;
3695}
3696
3697sub main_loop {
3698 trace "EV::loop starting\n";
3699 if (1) {
3700 EV::loop;
3701 }
3702 trace "EV::loop returned\n";
3703 goto &main_loop unless $REALLY_UNLOOP;
3704}
3705
3427sub main { 3706sub main {
3707 cf::init_globals; # initialise logging
3708
3709 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3710 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3711 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3712 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3713
3714 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3715
3428 # we must not ever block the main coroutine 3716 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3717 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3718 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3719 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3720 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3721 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3722 })->prio (Coro::PRIO_MAX);
3435 }; 3723 };
3436 3724
3437 { 3725 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3726
3727 cf::sync_job {
3728 cf::incloader::init ();
3729
3730 cf::init_anim;
3731 cf::init_attackmess;
3732 cf::init_dynamic;
3733
3734 cf::load_settings;
3735
3736 reload_resources;
3439 reload_config; 3737 reload_config;
3440 db_init; 3738 db_init;
3739
3740 cf::init_uuid;
3741 cf::init_signals;
3742 cf::init_skills;
3743
3744 cf::init_beforeplay;
3745
3746 atomic;
3747
3441 load_extensions; 3748 load_extensions;
3442 3749
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3750 utime time, time, $RUNTIMEFILE;
3751
3752 # no (long-running) fork's whatsoever before this point(!)
3753 use POSIX ();
3754 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3755
3756 cf::_post_init 0;
3444 } 3757 };
3445 3758
3446 EV::loop; 3759 cf::object::thawer::errors_are_fatal 0;
3760 info "parse errors in files are no longer fatal from this point on.\n";
3761
3762 my $free_main; $free_main = EV::idle sub {
3763 undef $free_main;
3764 undef &main; # free gobs of memory :)
3765 };
3766
3767 goto &main_loop;
3447} 3768}
3448 3769
3449############################################################################# 3770#############################################################################
3450# initialisation and cleanup 3771# initialisation and cleanup
3451 3772
3452# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3453BEGIN { 3774BEGIN {
3454 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3458 }; 3779 };
3459 } 3780 }
3460} 3781}
3461 3782
3462sub write_runtime_sync { 3783sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3784 my $t0 = AE::time;
3464 3785
3465 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3467 3788
3468 IO::AIO::aio_utime $runtime, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3790
3470 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3471 3792
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3794 or return;
3474 3795
3475 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3808 aio_utime $fh, undef, undef;
3488 3809
3489 close $fh 3810 close $fh
3490 or return; 3811 or return;
3491 3812
3492 aio_rename "$runtime~", $runtime 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3814 and return;
3494 3815
3495 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3817
3497 1 3818 1
3498} 3819}
3499 3820
3500our $uuid_lock; 3821our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3830 my $uuid = "$LOCALDIR/uuid";
3510 3831
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3832 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3833 or return;
3513 3834
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3836
3837 unless ($value) {
3838 info "cowardly refusing to write zero uuid value!\n";
3839 return;
3840 }
3841
3842 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3843 $uuid_skip = 0;
3516 3844
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3845 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3846 and return;
3519 3847
3525 or return; 3853 or return;
3526 3854
3527 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3528 and return; 3856 and return;
3529 3857
3530 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3531 3859
3532 1 3860 1
3533 3861
3534} 3862}
3535 3863
3541} 3869}
3542 3870
3543sub emergency_save() { 3871sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3545 3873
3546 warn "enter emergency perl save\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3547 3880
3548 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
3549 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3890 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3892 $pl->save;
3558 } 3893 }
3559 warn "end emergency player save\n"; 3894 info "emergency_perl_save: end player save\n";
3560 3895
3561 warn "begin emergency map save\n"; 3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3901 $map->valid or next;
3565 $map->save; 3902 $map->save;
3566 } 3903 }
3567 warn "end emergency map save\n"; 3904 info "emergency_perl_save: end map save\n";
3568 3905
3569 warn "begin emergency database checkpoint\n"; 3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3908 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3572 3911
3573 warn "begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3913 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3934 };
3577 3935
3578 warn "leave emergency perl save\n"; 3936 info "emergency_perl_save: leave\n";
3579} 3937}
3580 3938
3581sub post_cleanup { 3939sub post_cleanup {
3582 my ($make_core) = @_; 3940 my ($make_core) = @_;
3583 3941
3942 IO::AIO::flush;
3943
3584 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3945 if $make_core;
3946
3947 my $fh = pidfile;
3948 unlink $PIDFILE if <$fh> == $$;
3949}
3950
3951# a safer delete_package, copied from Symbol
3952sub clear_package($) {
3953 my $pkg = shift;
3954
3955 # expand to full symbol table name if needed
3956 unless ($pkg =~ /^main::.*::$/) {
3957 $pkg = "main$pkg" if $pkg =~ /^::/;
3958 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3959 $pkg .= '::' unless $pkg =~ /::$/;
3960 }
3961
3962 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3963 my $stem_symtab = *{$stem}{HASH};
3964
3965 defined $stem_symtab and exists $stem_symtab->{$leaf}
3966 or return;
3967
3968 # clear all symbols
3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3970 for my $name (keys %$leaf_symtab) {
3971 _gv_clear *{"$pkg$name"};
3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3973 }
3586} 3974}
3587 3975
3588sub do_reload_perl() { 3976sub do_reload_perl() {
3589 # can/must only be called in main 3977 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3592 return; 3980 return;
3593 } 3981 }
3594 3982
3595 warn "reloading..."; 3983 return if $RELOAD++;
3596 3984
3597 warn "entering sync_job"; 3985 my $t1 = AE::time;
3598 3986
3987 while ($RELOAD) {
3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3990
3991 trace "perl_reload: entering sync_job";
3992
3599 cf::sync_job { 3993 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3994 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3995
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3998 %EXT_CORO = ();
3623 3999
3624 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3625 %COMMAND = (); 4001 %COMMAND = ();
3626 4002
3627 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 4004 %EXTCMD = ();
3629 %EXTICMD = (); 4005 %EXTICMD = ();
3630 4006
3631 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3634 4010
3635 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3636 eval { 4012 eval {
3637 $cb->($pkg); 4013 $cb->($pkg);
3638 1 4014 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
4016 }
4017
4018 trace "... clearing $pkg";
4019 clear_package $pkg;
3640 } 4020 }
3641 4021
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 4025
3650 warn "... unloading $k"; 4026 trace "... unloading $k";
3651 delete $INC{$k}; 4027 delete $INC{$k};
3652 4028
3653 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3655 4031
3656 if (my $cb = $k->can ("unload_module")) { 4032 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 4033 $cb->();
4034 }
4035
4036 clear_package $k;
3658 } 4037 }
3659 4038
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 4040 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 4042
3667 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 4046
3671 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3672 # and global variables created in xs 4048 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3674 4050
3675 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3676 4052
3677 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3678 require cf; 4054 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3680 4056
3681 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 4058 cf::reload_config;
3683 4059
3684 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 4061 cf::load_extensions;
3686 4062
4063 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
4070 }
3693 4071
3694 warn "leaving sync_job"; 4072 cf::_post_init 1;
3695 4073
4074 trace "perl_reload: leaving sync_job";
4075
3696 1 4076 1
3697 } or do { 4077 } or do {
3698 warn $@; 4078 error $@;
3699 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
4080 };
4081
4082 --$RELOAD;
3700 }; 4083 }
3701 4084
3702 warn "reloaded"; 4085 $t1 = AE::time - $t1;
4086 info "perl_reload: completed in ${t1}s\n";
3703}; 4087};
3704 4088
3705our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3706 4090
3707sub reload_perl() { 4091sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4092 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3710 4094
4095 $RELOAD_WATCHER ||= cf::async {
4096 Coro::AIO::aio_wait cache_extensions;
4097
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4099 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
4101 };
3714 }; 4102 };
3715} 4103}
3716 4104
3717register_command "reload" => sub { 4105register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4106 my ($who, $arg) = @_;
3724 reload_perl; 4112 reload_perl;
3725 }; 4113 };
3726 } 4114 }
3727}; 4115};
3728 4116
3729unshift @INC, $LIBDIR; 4117#############################################################################
3730 4118
3731my $bug_warning = 0; 4119my $bug_warning = 0;
3732 4120
3733our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN;
3735
3736sub wait_for_tick { 4121sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4123
3739 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3740 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait;
3742} 4125}
3743 4126
3744sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746 4129
3747 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4132 $signal->wait;
3750} 4133}
3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3755 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3756 return; 4139 return;
3757 } 4140 }
3758 4141
3759 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 4145
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4148 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4150 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3767 }; 4152 };
3768 } 4153 }
3769 4154
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4156 $sig->send;
3772 } 4157 }
3773 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3774 $sig->send;
3775 }
3776 4159
3777 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779 4162
3780 if (0) { 4163 if (0) {
3781 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3785 } 4168 }
3786 } 4169 }
3787} 4170}
3788 4171
3789{ 4172{
3790 # configure BDB 4173 # configure BDB
3791 4174
3792 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4177 $AnyEvent::BDB::WATCHER->priority (1);
3795 4178
3796 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4183 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4184 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4185 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4186
3803 cf::sync_job { 4187 cf::sync_job {
3804 eval { 4188 eval {
3833 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3835 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3836} 4220}
3837 4221
3838my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3839 4224
3840sub _log_backtrace { 4225sub _log_backtrace {
3841 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3842 4227
3843 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3844 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3845 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3847 ++$_log_backtrace; 4236 ++$_log_backtrace;
4237 my $perl_bt = Carp::longmess $msg;
3848 async { 4238 async {
3849 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3850 4240
3851 my @bt = fork_call { 4241 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4242 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4253 }
3864 4254
3865 @funcs 4255 @funcs
3866 }; 4256 };
3867 4257
3868 LOG llevInfo, "[ABT] $msg\n"; 4258 LOG llevInfo, "[ABT] $perl_bt\n";
4259 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4261 --$_log_backtrace;
3871 }; 4262 };
3872 } else { 4263 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3875 } 4266 }
3876} 4267}
3877 4268
3878# load additional modules 4269# load additional modules
3879use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3880 4272
3881END { cf::emergency_save } 4273END { cf::emergency_save }
3882 4274
38831 42751
3884 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines