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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %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;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
81our $NOW; 138our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
86
87our %CFG;
88
89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME;
91 139
92our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
95 143
96# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 146
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
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;
102 159
103binmode STDOUT; 160binmode STDOUT;
104binmode STDERR; 161binmode STDERR;
105 162
106# read virtual server time, if available 163# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
111} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
112 171
113mkdir $_ 172mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 174
116our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
117 176
118sub cf::map::normalise; 177sub cf::map::normalise;
119 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
120############################################################################# 183#############################################################################
121 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
122=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
123 197
124=over 4 198=over 4
125 199
126=item $cf::UPTIME 200=item $cf::UPTIME
127 201
128The 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.
129 218
130=item $cf::RUNTIME 219=item $cf::RUNTIME
131 220
132The 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
133every server tick. 222every server tick.
139Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
142database environment. 231database environment.
143 232
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 233=item $cf::LOADAVG
153 234
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
159 240
160The raw value load value from the last tick. 241The raw value load value from the last tick.
161 242
162=item %cf::CFG 243=item %cf::CFG
163 244
164Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 246from wherever your confdir points to.
166 247
167=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
168 249
169These 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
170returns 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
171per 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.
172 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
173=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
174 272
175This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 275that call.
178 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
179=back 283=back
180 284
181=cut 285=cut
182 286
183BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 294 my $msg = join "", @_;
186 295
187 $msg .= "\n" 296 $msg .= "\n"
188 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
189 298
190 $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;
191 300
192 utf8::encode $msg;
193 LOG llevError, $msg; 301 LOG llevWarn, $msg;
194 }; 302};
195} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
196 317
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 328for my $pkg (qw(
208 cf::global cf::attachable 329 cf::global cf::attachable
209 cf::object cf::object::player 330 cf::object cf::object::player
210 cf::client cf::player 331 cf::client cf::player
211 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
212 cf::map cf::party cf::region 334 cf::party cf::region
213)) { 335)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 337}
217 338
218$Event::DIED = sub { 339$EV::DIED = sub {
219 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
220}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
221 347
222############################################################################# 348#############################################################################
223 349
224=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
225 351
246 $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;
247 $d 373 $d
248 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
249} 375}
250 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
251=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
252 392
253Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
254 394
255=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
256 396
257Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
258 398
259=cut 399=cut
260 400
261our $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
262 402
263sub to_json ($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
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}
265 467
266=item cf::lock_wait $string 468=item cf::lock_wait $string
267 469
268Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
269 471
270=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
271 473
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
275returned. 477returned.
276 478
277Locks 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
278deadlocked coro. 480deadlocked coro.
284 486
285Return 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.
286 488
287=cut 489=cut
288 490
289our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 492
292sub lock_wait($) { 493sub lock_wait($) {
293 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 495}
306 496
307sub lock_acquire($) { 497sub lock_acquire($) {
308 my ($key) = @_; 498 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 499}
322 500
323sub lock_active($) { 501sub lock_active($) {
324 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 503}
328 504
329sub freeze_mainloop { 505sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
331 507
332 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 509}
334 }; 510
335 $TICK_WATCHER->stop; 511=item cf::periodic $interval, $cb
336 $guard 512
513Like EV::periodic, but randomly selects a starting point so that the actions
514get spread over time.
515
516=cut
517
518sub periodic($$) {
519 my ($interval, $cb) = @_;
520
521 my $start = rand List::Util::min 180, $interval;
522
523 EV::periodic $start, $interval, 0, $cb
337} 524}
338 525
339=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
340 527
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
342This 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
343of 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.
344 535
345The 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
346used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
347 538
348Useful for short background jobs. 539Useful for short background jobs.
349 540
350=cut 541=cut
351 542
352our @SLOT_QUEUE; 543our @SLOT_QUEUE;
353our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
354 546
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
549 $Coro::current->desc ("timeslot manager");
550
357 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
358 553
359 while () { 554 while () {
360 next_job: 555 next_job:
556
361 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 558
363 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 563 $job->[2]->send;
367 Coro::cede; 564 Coro::cede;
368 goto next_job; 565 goto next_job;
369 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 568 }
371 } 569 }
372 570
373 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
374 # 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
375 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
376 $signal->wait;
377 } else { 574 } else {
575 $busy = 0;
378 Coro::schedule; 576 Coro::schedule;
379 } 577 }
380 } 578 }
381}; 579};
382 580
383sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
384 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
385 585
386 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
387 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
388 589
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
402 603
403BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
404 605
405=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
406 607
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 609is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 611acceptable.
411 612
412If it must be done, put the blocking parts into C<sync_job>. This will run 613If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 614the given BLOCK in another coroutine while waiting for the result. The
417=cut 618=cut
418 619
419sub sync_job(&) { 620sub sync_job(&) {
420 my ($job) = @_; 621 my ($job) = @_;
421 622
422 if ($Coro::current == $Coro::main) { 623 if (in_main) {
423 my $time = Event::time; 624 my $time = AE::time;
424 625
425 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
427 628
428 # TODO: use suspend/resume instead 629 #LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 630
430 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
431 632
432 my $busy = 1; 633 my $busy = 1;
433 my @res; 634 my @res;
434 635
435 (async { 636 (async {
637 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 638 @res = eval { $job->() };
437 warn $@ if $@; 639 error $@ if $@;
438 undef $busy; 640 undef $busy;
439 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
440 642
441 while ($busy) { 643 while ($busy) {
442 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
443 } 648 }
649 }
444 650
445 $time = Event::time - $time; 651 my $time = AE::time - $time;
446 652
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
451 654
452 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
453 } else { 656 } else {
454 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
455 658
475 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
476 679
477 $coro 680 $coro
478} 681}
479 682
480=item fork_call { }, $args 683=item fork_call { }, @args
481 684
482Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
486 689
487=cut 690=cut
691
692sub post_fork {
693 reset_signals;
694}
488 695
489sub fork_call(&@) { 696sub fork_call(&@) {
490 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
491 698
492 # 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,
493 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
495 702
496 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
497 reset_signals; 704 cf::post_fork;
498 &$cb 705 &$cb
499 }, @args; 706 } @args;
500 707
501 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 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
502} 747}
503 748
504=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
505 750
506Returns a single value from the environment database. 751Returns a single value from the environment database.
508=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
509 754
510Stores the given C<$value> in the family. It can currently store binary 755Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 756data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 757
758=item $db = cf::db_table "name"
759
760Create and/or open a new database table. The string must not be "db" and must be unique
761within each server.
762
513=cut 763=cut
764
765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
769 my ($name) = @_;
770 my $db = BDB::db_create $DB_ENV;
771
772 eval {
773 $db->set_flags (BDB::CHKSUM);
774
775 utf8::encode $name;
776 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
777 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
778 cf::cleanup "db_open(db): $!" if $!;
779 };
780 cf::cleanup "db_open(db): $@" if $@;
781
782 $db
783}
514 784
515our $DB; 785our $DB;
516 786
517sub db_init { 787sub db_init {
518 unless ($DB) { 788 $DB ||= db_table "db";
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 }
532} 789}
533 790
534sub db_get($$) { 791sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
536 793
537 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
538 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
539 798
540 $! ? () 799 $! ? ()
541 : $data 800 : $data
542 }
543} 801}
544 802
545sub db_put($$$) { 803sub db_put($$$) {
546 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
575 833
576 my @data; 834 my @data;
577 my $md5; 835 my $md5;
578 836
579 for (0 .. $#$src) { 837 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
581 or Carp::croak "$src->[$_]: $!";
582 } 839 }
583 840
584 # if processing is expensive, check 841 # if processing is expensive, check
585 # checksum first 842 # checksum first
586 if (1) { 843 if (1) {
603 860
604 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data); 862 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
607 864
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
609 866
610 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
613 870
623 880
624=cut 881=cut
625 882
626sub datalog($@) { 883sub datalog($@) {
627 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
629} 886}
630 887
631=back 888=back
632 889
633=cut 890=cut
634 891
635############################################################################# 892#############################################################################
636 893
637=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
638 895
639Many 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
640attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
642 899
643In 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>
644C<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
645Crossfire TRT). 902Deliantra).
646 903
647=over 4 904=over 4
648 905
649=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
650 907
694=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
695 952
696Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
698 955
699Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
700that 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.
701 958
702These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
703 960
704=over 4 961=over 4
828 1085
829 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
830 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
831 1088
832 } elsif (ref $type) { 1089 } elsif (ref $type) {
833 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
834 1091
835 } else { 1092 } else {
836 shift @arg; 1093 shift @arg;
837 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
838 } 1095 }
839 } 1096 }
840} 1097}
841 1098
842sub _object_attach { 1099sub _object_attach {
852 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
853 } 1110 }
854 1111
855 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
856 } else { 1113 } else {
857 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
858 } 1115 }
859 1116
860 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
861} 1118}
862 1119
921 1178
922 for (@$callbacks) { 1179 for (@$callbacks) {
923 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
924 1181
925 if ($@) { 1182 if ($@) {
926 warn "$@";
927 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
928 override; 1184 override;
929 } 1185 }
930 1186
931 return 1 if $override; 1187 return 1 if $override;
932 } 1188 }
933 1189
934 0 1190 0
935} 1191}
936 1192
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1194
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1196
941Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
942 1198
948 1204
949=cut 1205=cut
950 1206
951############################################################################# 1207#############################################################################
952# object support 1208# object support
953#
954 1209
1210sub _object_equal($$);
1211sub _object_equal($$) {
1212 my ($a, $b) = @_;
1213
1214 return 0 unless (ref $a) eq (ref $b);
1215
1216 if ("HASH" eq ref $a) {
1217 my @ka = keys %$a;
1218 my @kb = keys %$b;
1219
1220 return 0 if @ka != @kb;
1221
1222 for (0 .. $#ka) {
1223 return 0 unless $ka[$_] eq $kb[$_];
1224 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1225 }
1226
1227 } elsif ("ARRAY" eq ref $a) {
1228
1229 return 0 if @$a != @$b;
1230
1231 for (0 .. $#$a) {
1232 return 0 unless _object_equal $a->[$_], $b->[$_];
1233 }
1234
1235 } elsif ($a ne $b) {
1236 return 0;
1237 }
1238
1239 1
1240}
1241
1242our $SLOW_MERGES;#d#
955sub _can_merge { 1243sub _can_merge {
956 my ($ob1, $ob2) = @_; 1244 my ($ob1, $ob2) = @_;
957 1245
958 local $Storable::canonical = 1; 1246 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1247
962 $fob1 eq $fob2 1248 # we do the slow way here
1249 return _object_equal $ob1, $ob2
963} 1250}
964 1251
965sub reattach { 1252sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1254 my ($obj) = @_;
968 1255
1256 # no longer needed after getting rid of delete_package?
969 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
970 1258
971 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
972 1260
973 @$registry = (); 1261 @$registry = ();
974 1262
979 for (@$attach) { 1267 for (@$attach) {
980 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
981 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
982 } 1270 }
983 } else { 1271 } else {
984 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
985 } 1273 }
986 } 1274 }
987} 1275}
988 1276
989cf::attachable->attach ( 1277cf::attachable->attach (
990 prio => -1000000, 1278 prio => -1000000,
991 on_instantiate => sub { 1279 on_instantiate => sub {
992 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
993 1281
994 $data = from_json $data; 1282 $data = decode_json $data;
995 1283
996 for (@$data) { 1284 for (@$data) {
997 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
998 1286
999 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
1013); 1301);
1014 1302
1015sub object_freezer_save { 1303sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1017 1305
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1306 sync_job {
1021 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1024 1312
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 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 }
1029 close $fh; 1320 aio_close $fh;
1030 1321
1031 if (@$objs) { 1322 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1036 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 }
1037 close $fh; 1331 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1333 }
1040 } else { 1334 } else {
1041 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1042 } 1336 }
1043 1337
1044 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1342 } else {
1046 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1047 } 1344 }
1048 } else { 1345 } else {
1049 aio_unlink $filename; 1346 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1051 } 1348 }
1052 }; 1349 };
1053
1054 undef $guard;
1055} 1350}
1056 1351
1057sub object_freezer_as_string { 1352sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
1059 1354
1064 1359
1065sub object_thawer_load { 1360sub object_thawer_load {
1066 my ($filename) = @_; 1361 my ($filename) = @_;
1067 1362
1068 my ($data, $av); 1363 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1364
1072 (aio_load $filename, $data) >= 0 1365 (aio_load $filename, $data) >= 0
1073 or return; 1366 or return;
1074 1367
1075 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1370 or return;
1078 1371
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1081 } 1374 }
1082 1375
1376 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1085 1380
1086 ($data, $av) 1381 ($data, $av)
1087} 1382}
1088 1383
1089=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1146 1441
1147 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1148} 1443}
1149 1444
1445use File::Glob ();
1446
1150cf::player->attach ( 1447cf::player->attach (
1151 on_command => sub { 1448 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1153 1450
1154 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1155 or return; 1452 or return;
1156 1453
1164 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1165 1462
1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1167 1464
1168 if (ref $msg) { 1465 if (ref $msg) {
1169 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173 1467
1174 my @reply; 1468 my @reply;
1175 1469
1176 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1177 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1179 1473
1180 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1181 if $reply; 1475 if $reply;
1182 1476
1183 } else { 1477 } else {
1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1185 } 1479 }
1186 1480
1187 cf::override; 1481 cf::override;
1188 }, 1482 },
1189); 1483);
1190 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1191sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1192 cf::sync_job { 1501 cf::sync_job {
1193 my %todo; 1502 my %todo;
1194 1503
1195 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1196 next unless -r $path; 1505 next unless -r $path;
1214 1523
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1526
1218 $ext{source} = 1527 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1220 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1221 . $source 1530 . $source
1222 . "\n};\n1"; 1531 . "\n};\n1";
1223 1532
1224 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1225 } 1534 }
1226 1535
1536 my $pass = 0;
1227 my %done; 1537 my %done;
1228 while (%todo) { 1538 while (%todo) {
1229 my $progress; 1539 my $progress;
1230 1540
1541 ++$pass;
1542
1543 ext:
1231 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1546 next ext
1234 unless exists $done{$_}; 1547 unless exists $done{$_};
1235 } 1548 }
1236 1549
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1551
1239 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1244 warn $msg; 1559
1245 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1246 exit 1; 1561 delete $todo{$k};
1247 } 1562 } else {
1248 1563 $done{$k} = delete $todo{$k};
1249 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1250 } 1569 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1570 }
1256 1571
1257 skip: 1572 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1260 } 1582 }
1261 }; 1583 };
1262} 1584}
1263 1585
1264############################################################################# 1586#############################################################################
1265 1587
1266=back 1588=back
1267 1589
1268=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1269 1591
1270Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1271 1593
1272=cut 1594=cut
1273 1595
1274package cf::player; 1596package cf::player;
1275 1597
1276use Coro::AIO; 1598use Coro::AIO;
1277 1599
1278=head3 cf::player 1600=head3 cf::player
1279 1601
1280=over 4 1602=over 4
1603
1604=item cf::player::num_playing
1605
1606Returns the official number of playing players, as per the Crossfire metaserver rules.
1607
1608=cut
1609
1610sub num_playing {
1611 scalar grep
1612 $_->ob->map
1613 && !$_->hidden
1614 && !$_->ob->flag (cf::FLAG_WIZ),
1615 cf::player::list
1616}
1281 1617
1282=item cf::player::find $login 1618=item cf::player::find $login
1283 1619
1284Returns the given player object, loading it if necessary (might block). 1620Returns the given player object, loading it if necessary (might block).
1285 1621
1304 1640
1305sub exists($) { 1641sub exists($) {
1306 my ($login) = @_; 1642 my ($login) = @_;
1307 1643
1308 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1310} 1646}
1311 1647
1312sub find($) { 1648sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1650 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1661
1326 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1663 or return;
1328 1664
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1331 or return; 1666 or return;
1667
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1335 } 1671 }
1336 } 1672 }
1337} 1673}
1338 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1339sub save($) { 1688sub save($) {
1340 my ($pl) = @_; 1689 my ($pl) = @_;
1341 1690
1342 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1343 1692
1346 1695
1347 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1348 1697
1349 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1351 1705
1352 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1707 cf::cede_to_tick;
1354} 1708}
1355 1709
1387 my ($pl) = @_; 1741 my ($pl) = @_;
1388 1742
1389 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1390 1744
1391 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1747
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1395 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1397 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1398 1756
1399 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1401 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1439 1797
1440 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1441 my $path = path $login; 1799 my $path = path $login;
1442 1800
1443 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1807 }
1449 1808
1453 1812
1454 \@logins 1813 \@logins
1455} 1814}
1456 1815
1457=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1458 1819
1459Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1460player. May block. 1821player. May block.
1461 1822
1462=cut 1823=cut
1480 } 1841 }
1481 1842
1482 \@paths 1843 \@paths
1483} 1844}
1484 1845
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1847
1487Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1849
1536=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1537 1851
1538Sends an ext reply to the player. 1852Sends an ext reply to the player.
1539 1853
1571 1885
1572=cut 1886=cut
1573 1887
1574sub find_by_path($) { 1888sub find_by_path($) {
1575 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1576 1892
1577 my ($match, $specificity); 1893 my ($match, $specificity);
1578 1894
1579 for my $region (list) { 1895 for my $region (list) {
1580 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1606our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1608 1924
1609sub generate_random_map { 1925sub generate_random_map {
1610 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1611 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1612 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1616 $rmp->{exit_on_final_map},
1617 $rmp->{xsize}, $rmp->{ysize},
1618 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1619 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1620 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1621 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1622 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1623 (cf::region::find $rmp->{region}), $rmp->{custom}
1624 )
1625} 1931}
1626 1932
1627=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1628 1934
1629Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1634 1940
1635sub register { 1941sub register {
1636 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1637 my $pkg = caller; 1943 my $pkg = caller;
1638 1944
1639 no strict;
1640 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1641 1946
1642 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1643} 1948}
1644 1949
1645# also paths starting with '/' 1950# also paths starting with '/'
1646$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1647 1952
1648sub thawer_merge { 1953sub thawer_merge {
1649 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1650 1955
1651 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1656} 1961}
1657 1962
1658sub normalise { 1963sub normalise {
1659 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1660 1965
1661 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1662 1967
1663 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1664 1969
1665 # map plan: 1970 # map plan:
1666 # 1971 #
1681 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1682 $path = "$base/$path"; 1987 $path = "$base/$path";
1683 } 1988 }
1684 1989
1685 for ($path) { 1990 for ($path) {
1686 redo if s{//}{/};
1687 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1688 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1689 } 1993 }
1690 1994
1691 $path 1995 $path
1705 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1706 return $self; 2010 return $self;
1707 } 2011 }
1708 } 2012 }
1709 2013
1710 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1711 () 2015 ()
1712} 2016}
1713 2017
2018# may re-bless or do other evil things
1714sub init { 2019sub init {
1715 my ($self) = @_; 2020 my ($self) = @_;
1716 2021
1717 $self 2022 $self
1718} 2023}
1737 2042
1738# the temporary/swap location 2043# the temporary/swap location
1739sub save_path { 2044sub save_path {
1740 my ($self) = @_; 2045 my ($self) = @_;
1741 2046
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1744} 2049}
1745 2050
1746# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1747sub uniq_path { 2052sub uniq_path {
1748 my ($self) = @_; 2053 my ($self) = @_;
1749 2054
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 2057}
1762 2058
1763sub decay_objects { 2059sub decay_objects {
1764 my ($self) = @_; 2060 my ($self) = @_;
1765 2061
1792 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1793 2089
1794 1 2090 1
1795} 2091}
1796 2092
2093# used to laod the header of an original map
1797sub load_header_orig { 2094sub load_header_orig {
1798 my ($self) = @_; 2095 my ($self) = @_;
1799 2096
1800 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1801} 2098}
1802 2099
2100# used to laod the header of an instantiated map
1803sub load_header_temp { 2101sub load_header_temp {
1804 my ($self) = @_; 2102 my ($self) = @_;
1805 2103
1806 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1807} 2105}
1808 2106
2107# called after loading the header from an instantiated map
1809sub prepare_temp { 2108sub prepare_temp {
1810 my ($self) = @_; 2109 my ($self) = @_;
1811 2110
1812 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1813 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1814 # safety 2113 # safety
1815 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1816 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1817} 2116}
1818 2117
2118# called after loading the header from an original map
1819sub prepare_orig { 2119sub prepare_orig {
1820 my ($self) = @_; 2120 my ($self) = @_;
1821 2121
1822 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1823 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1847 2147
1848sub find; 2148sub find;
1849sub find { 2149sub find {
1850 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1851 2151
2152 cf::cede_to_tick;
2153
1852 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1853 2155
1854 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1856 2158
1857 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1862 or return; 2161 or return;
1863 2162
1864 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1865 2164
1867 or return; 2166 or return;
1868 2167
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
1872 undef $guard1; 2172 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2173 $map->reset;
1875 return find $path; 2174 return find $path;
1876 } 2175 }
1877 2176
1878 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1879 } 2178 }
1880} 2179}
1881 2180
1882sub pre_load { } 2181sub pre_load { }
1883sub post_load { } 2182#sub post_load { } # XS
1884 2183
1885sub load { 2184sub load {
1886 my ($self) = @_; 2185 my ($self) = @_;
1887 2186
1888 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1891 2190
1892 { 2191 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1894 2193
1895 return unless $self->valid; 2194 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1897
1898 $self->in_memory (cf::MAP_LOADING);
1899 2196
1900 $self->alloc; 2197 $self->alloc;
1901 2198
1902 $self->pre_load; 2199 $self->pre_load;
1903 cf::cede_to_tick; 2200 cf::cede_to_tick;
1904 2201
2202 if (exists $self->{load_path}) {
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2204 $f->skip_block;
1907 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
1908 or return; 2206 or return;
1909 2207
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1911 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1912 2210
1913 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2212 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1917 $self->clear_unique_items; 2215 $self->clear_unique_items;
1918 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
1920 } 2219 }
1921 } 2220 }
1922 }
1923 2221
1924 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
1925 2229
1926 cf::cede_to_tick; 2230 cf::cede_to_tick;
1927 # now do the right thing for maps 2231 # now do the right thing for maps
1928 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1929 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1933 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2238 $self->decay_objects;
1935 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1936 $self->update_buttons; 2240 $self->update_buttons;
1937 cf::cede_to_tick; 2241 cf::cede_to_tick;
1938 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1939 cf::cede_to_tick;
1940 $self->activate;
1941 } 2243 }
1942 2244
1943 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
1945
1946 $self->in_memory (cf::MAP_IN_MEMORY);
1947 } 2247 }
1948 2248
1949 $self->post_load; 2249 $self->post_load;
1950}
1951 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
1952sub customise_for { 2257sub customise_for {
1953 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1954 2259
1955 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1956 if $self->per_player; 2261 if $self->per_player;
1959# if $self->per_party; 2264# if $self->per_party;
1960 2265
1961 $self 2266 $self
1962} 2267}
1963 2268
1964# find and load all maps in the 3x3 area around a map
1965sub load_neighbours {
1966 my ($map) = @_;
1967
1968 my @neigh; # diagonal neighbours
1969
1970 for (0 .. 3) {
1971 my $neigh = $map->tile_path ($_)
1972 or next;
1973 $neigh = find $neigh, $map
1974 or next;
1975 $neigh->load;
1976
1977 push @neigh,
1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1980 }
1981
1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1984 my $neigh = find $path, $origin
1985 or next;
1986 $neigh->load;
1987 }
1988}
1989
1990sub find_sync { 2269sub find_sync {
1991 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
1992 2271
1993 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
1994} 2277}
1995 2278
1996sub do_load_sync { 2279sub do_load_sync {
1997 my ($map) = @_; 2280 my ($map) = @_;
1998 2281
2282 # it's a bug to call this from the main context
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2001 2285
2002 cf::sync_job { $map->load }; 2286 $map->load;
2003} 2287}
2004 2288
2005our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2006our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2007 2291
2008sub find_async { 2292sub find_async {
2009 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2010 2294
2011 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2012 2296
2013 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2015 } 2299 }
2016 2300
2017 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2018 2302
2019 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
2020 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2308 if (my $map = find $k) {
2023 $map->load if $v; 2309 $map->load if $v;
2024 } 2310 }
2031 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2032 2318
2033 () 2319 ()
2034} 2320}
2035 2321
2322# common code, used by both ->save and ->swapout
2036sub save { 2323sub _save {
2037 my ($self) = @_; 2324 my ($self) = @_;
2038
2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2040 2325
2041 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2042 2327
2043 return unless $self->dirty; 2328 return unless $self->dirty;
2044 2329
2050 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2051 2336
2052 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
2053 2338
2054 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2056 }; 2342 };
2343
2344 cf::get_slot 0.02;
2057 2345
2058 if ($uniq) { 2346 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2349 } else {
2062 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2063 } 2351 }
2064} 2352}
2065 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2066sub swap_out { 2362sub swap_out {
2067 my ($self) = @_; 2363 my ($self) = @_;
2068 2364
2069 # save first because save cedes
2070 $self->save;
2071
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2074 return if $self->players; 2369 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save};
2077 2370
2371 # first deactivate the map and "unlink" it from the core
2078 $self->deactivate; 2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2079 $self->clear; 2380 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2381}
2082 2382
2083sub reset_at { 2383sub reset_at {
2084 my ($self) = @_; 2384 my ($self) = @_;
2085 2385
2103 2403
2104 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2105 2405
2106 return if $self->players; 2406 return if $self->players;
2107 2407
2108 warn "resetting map ", $self->path; 2408 cf::trace "resetting map ", $self->path, "\n";
2109 2409
2110 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2111 2411
2112 # need to save uniques path 2412 # need to save uniques path
2113 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2114 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2115 2415
2118 } 2418 }
2119 2419
2120 delete $cf::MAP{$self->path}; 2420 delete $cf::MAP{$self->path};
2121 2421
2122 $self->deactivate; 2422 $self->deactivate;
2423 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2424 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2425
2127 $self->unlink_save; 2426 $self->unlink_save;
2128 $self->destroy; 2427 $self->destroy;
2129} 2428}
2130 2429
2138 2437
2139 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2140 2439
2141 $self->unlink_save; 2440 $self->unlink_save;
2142 2441
2143 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2144 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2145 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2146 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2148 2447
2197 2496
2198sub unique_maps() { 2497sub unique_maps() {
2199 [ 2498 [
2200 map { 2499 map {
2201 utf8::decode $_; 2500 utf8::decode $_;
2202 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2203 ? normalise $_ 2504 : normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2206 ] 2506 ]
2207} 2507}
2208 2508
2209package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2210 2540
2211=back 2541=back
2212 2542
2213=head3 cf::object 2543=head3 cf::object
2214 2544
2218 2548
2219=over 4 2549=over 4
2220 2550
2221=item $ob->inv_recursive 2551=item $ob->inv_recursive
2222 2552
2223Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2224 2555
2225=cut 2556=cut
2226 2557
2227sub inv_recursive_; 2558sub inv_recursive_;
2228sub inv_recursive_ { 2559sub inv_recursive_ {
2233 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2234} 2565}
2235 2566
2236=item $ref = $ob->ref 2567=item $ref = $ob->ref
2237 2568
2238creates and returns a persistent reference to an objetc that can be stored as a string. 2569Creates and returns a persistent reference to an object that can be stored as a string.
2239 2570
2240=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2241 2572
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block. 2574even if the object actually exists. May block.
2245=cut 2576=cut
2246 2577
2247sub deref { 2578sub deref {
2248 my ($ref) = @_; 2579 my ($ref) = @_;
2249 2580
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2581 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2582 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2583 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2584 or return;
2257 $pl->ob->uuid eq $uuid 2585 $pl->ob->uuid eq $uuid
2258 or return; 2586 or return;
2278can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2279dialogue with the given NPC character. 2607dialogue with the given NPC character.
2280 2608
2281=cut 2609=cut
2282 2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2624
2283# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2284# with dialog boxes. 2626# with dialog boxes.
2285#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2286sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2287 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2298 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300 2642
2301 } else { 2643 } else {
2302 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2303 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2304 } 2646 }
2305 } 2647 }
2306} 2648}
2307 2649
2308=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2333 2675
2334=item $player_object->enter_link 2676=item $player_object->enter_link
2335 2677
2336Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2337 2679
2338The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2339I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2340 2684
2341Will never block. 2685Will never block.
2342 2686
2343=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2344 2688
2364sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2365 my ($self) = @_; 2709 my ($self) = @_;
2366 2710
2367 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2368 2712
2713 ++$self->{_link_recursion};
2714
2369 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2370 2716
2371 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2372 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2373 2719
2374 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2375} 2721}
2376 2722
2377sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2378 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2379 2725
2396 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2397 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2398 2744
2399 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2400 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2401 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2402 2748
2403 $map->load; 2749 $map->load;
2404 $map->load_neighbours;
2405 2750
2406 return unless $self->contr->active; 2751 return unless $self->contr->active;
2407 $self->activate_recursive;
2408 2752
2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2410 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2411} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2412 2760
2761}
2762
2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2414 2764
2415Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2416her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2417that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2418the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process. 2769be called at the end of this process.
2420 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2421=cut 2774=cut
2422 2775
2423our $GOTOGEN; 2776our $GOTOGEN;
2424 2777
2425sub cf::object::player::goto { 2778sub cf::object::player::goto {
2426 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2427 2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2786
2428 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2789
2431 $self->enter_link; 2790 $self->enter_link;
2432 2791
2433 (async { 2792 (async {
2793 $Coro::current->{desc} = "player::goto $path $x $y";
2794
2795 # *tag paths override both path and x|y
2796 if ($path =~ /^\*(.*)$/) {
2797 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2798 my $ob = $obs[rand @obs];
2799
2800 # see if we actually can go there
2801 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2802 $ob = $obs[rand @obs];
2803 } else {
2804 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2805 }
2806 # else put us there anyways for now #d#
2807
2808 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2809 } else {
2810 ($path, $x, $y) = (undef, undef, undef);
2811 }
2812 }
2813
2434 my $map = eval { 2814 my $map = eval {
2435 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2436 2816
2437 if ($map) { 2817 if ($map) {
2438 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2440 } else { 2820 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2822 }
2443 2823
2444 $map 2824 $map
2445 }; 2825 };
2446 2826
2452 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2453 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2454 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2455 } 2835 }
2456 2836
2457 $done->() if $done; 2837 $done->($self) if $done;
2458 })->prio (1); 2838 })->prio (1);
2459} 2839}
2460 2840
2461=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2462 2842
2482} 2862}
2483 2863
2484sub prepare_random_map { 2864sub prepare_random_map {
2485 my ($exit) = @_; 2865 my ($exit) = @_;
2486 2866
2487 my $guard = cf::lock_acquire "exit_prepare:$exit";
2488
2489 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2490 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2491 # that depends on the exit object 2869 # that depends on the exit object
2492 2870
2493 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2495 if ($exit->map) { 2873 if ($exit->map) {
2496 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2497 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2498 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2499 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2500 } 2880 }
2501 2881
2502 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2503 2883
2504 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2505 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2507 2887
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2510 undef $fh; 2890 undef $fh;
2511 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2512 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2513 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2514 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2515 } 2899 }
2516} 2900}
2517 2901
2518sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2519 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2520 2904
2521 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2522 2906
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
2534 $self->enter_link; 2907 $self->enter_link;
2535 2908
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2540 (async { 2909 (async {
2541 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2542 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2543 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2544 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2545 1; 2948 1
2546 }) { 2949 }) {
2547 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2548 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2549 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2550 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2551 2954
2552 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2553 $self->leave_link; 2956 $self->leave_link;
2554 } 2957 }
2555 })->prio (1); 2958 })->prio (1);
2556} 2959}
2557 2960
2569sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2570 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2571 2974
2572 utf8::encode $text; 2975 utf8::encode $text;
2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2574} 3002}
2575 3003
2576=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2577 3005
2578Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2580the message, with C<log> being the default. If C<$color> is negative, suppress 3008the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2582 3010
2583=cut 3011=cut
2584 3012
3013# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2586 "c/identify" => { 3021 "c/identify" => {
2587 id => "identify", 3022 id => "infobox",
2588 title => "Identify", 3023 title => "Identify",
2589 reply => undef, 3024 reply => undef,
2590 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2591 }, 3026 },
2592 "c/examine" => { 3027 "c/examine" => {
2593 id => "examine", 3028 id => "infobox",
2594 title => "Examine", 3029 title => "Examine",
2595 reply => undef, 3030 reply => undef,
2596 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
2597 }, 3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
3038 },
3039 "c/book" => {
3040 id => "infobox",
3041 title => "Book",
3042 reply => undef,
3043 tooltip => "The contents of a note or book",
3044 },
3045 "c/lookat" => {
3046 id => "infobox",
3047 title => "Look",
3048 reply => undef,
3049 tooltip => "What you saw there",
3050 },
3051 "c/who" => {
3052 id => "infobox",
3053 title => "Players",
3054 reply => undef,
3055 tooltip => "Shows players who are currently online",
3056 },
3057 "c/body" => {
3058 id => "infobox",
3059 title => "Body Parts",
3060 reply => undef,
3061 tooltip => "Shows which body parts you posess and are available",
3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
3099 "c/uptime" => {
3100 id => "infobox",
3101 title => "Uptime",
3102 reply => undef,
3103 tooltip => "How long the server has been running since last restart",
3104 },
3105 "c/mapinfo" => {
3106 id => "infobox",
3107 title => "Map Info",
3108 reply => undef,
3109 tooltip => "Information related to the maps",
3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2598); 3125);
2599 3126
2600sub cf::client::send_msg { 3127sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2602 3129
2603 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2604 3132
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 3134
2607 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3136 if ($CHANNEL{$channel}) {
3137 $channel = $CHANNEL{$channel};
2609 3138
3139 $self->ext_msg (channel_info => $channel);
3140 $channel = $channel->{id};
3141
2610 if (ref $channel) { 3142 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2615 if $self->can_msg;
2616 } 3147 }
2617 3148
2618 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2619 } 3150 }
2620 3151
2621 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2622 3153
2623 if ($self->can_msg) {
2624 # default colour, mask it out 3154 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2627 3157
2628 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2630 } else { 3161 );
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641 3162
2642 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655} 3164}
2656 3165
2657=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2658 3167
2659Sends an ext event to the client. 3168Sends an ext event to the client.
2662 3171
2663sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2664 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2665 3174
2666 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2669 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 } 3180 }
2672} 3181}
2673 3182
2674=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2675 3184
2678=cut 3187=cut
2679 3188
2680sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2682 3191
2683 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2690} 3195}
2691 3196
2692=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2693 3198
2694Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2749 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2750 3255
2751 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2752 3257
2753 if (ref $msg) { 3258 if (ref $msg) {
2754 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758 3260
2759 my @reply; 3261 my @reply;
2760 3262
2761 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2762 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2764 3266
2765 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2766 if $reply; 3268 if $reply;
2767 3269
2768 } else { 3270 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 } 3272 }
2771 3273
2772 cf::override; 3274 cf::override;
2773 }, 3275 },
2774); 3276);
2794 3296
2795 $coro 3297 $coro
2796} 3298}
2797 3299
2798cf::client->attach ( 3300cf::client->attach (
2799 on_destroy => sub { 3301 on_client_destroy => sub {
2800 my ($ns) = @_; 3302 my ($ns) = @_;
2801 3303
2802 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2803 }, 3305 },
2804); 3306);
2820our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2821 3323
2822$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2823 3325
2824$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
2826 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
2827 sort time 3329 sort time
2828)); 3330));
2829 3331
2830# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2832=pod 3334=pod
2833 3335
2834The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2835 3337
2836 cf::object 3338 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3339 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
2839 3342
2840 cf::object::player 3343 cf::object::player
2841 player 3344 player
2842 3345
2843 cf::player 3346 cf::player
2848 3351
2849=cut 3352=cut
2850 3353
2851for ( 3354for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
2854 decrease_ob_nr)], 3357 decrease split destroy change_exp value msg lore send_msg)],
2855 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2857 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2858) { 3361) {
2859 no strict 'refs';
2860 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2861 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2862 for @funs; 3364 for @funs;
2863} 3365}
2864 3366
2879 3381
2880 my $qcode = $code; 3382 my $qcode = $code;
2881 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2882 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2883 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2884 local $_; 3389 local $_;
2885 local @safe::cf::_safe_eval_args = values %vars;
2886 3390
2887 my $eval = 3391 my $eval =
2888 "do {\n" 3392 "do {\n"
2889 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2890 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2891 . $code 3395 . $code
2892 . "\n}" 3396 . "\n}"
2893 ; 3397 ;
2894 3398
3399 if ($CFG{safe_eval}) {
2895 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2896 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2897 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
2898 3408
2899 if ($@) { 3409 if ($@) {
2900 warn "$@"; 3410 warn "$@",
2901 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2902 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2903 } 3413 }
2904 3414
2905 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2906} 3416}
2907 3417
2921=cut 3431=cut
2922 3432
2923sub register_script_function { 3433sub register_script_function {
2924 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2925 3435
2926 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2927 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2928} 3438}
2929 3439
2930=back 3440=back
2931 3441
2932=cut 3442=cut
2941 # for this (global event?) 3451 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
2943 3453
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945 3455
2946 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2947 3457
2948 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2949 0 < aio_load $path, $facedata
2950 or die "$path: $!";
2951
2952 $facedata = Coro::Storable::thaw $facedata;
2953 3459
2954 $facedata->{version} == 2 3460 $facedata->{version} == 2
2955 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956 3462
2957 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2958 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC, 3466 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
2961 }; 3469 };
2962 cf::cede_to_tick; 3470 cf::cede_to_tick;
2963 3471
2964 { 3472 {
2965 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2966 3474
2967 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2969 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2973 3483
2974 cf::cede_to_tick; 3484 cf::cede_to_tick;
2975 } 3485 }
2976 3486
2977 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2979 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2980 or next; 3491 or next;
3492
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3496 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
2986 } 3498 }
2987 3499
2988 cf::cede_to_tick; 3500 cf::cede_to_tick;
2989 } 3501 }
2990 } 3502 }
2999 3511
3000 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3001 } 3513 }
3002 3514
3003 { 3515 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3007 3517
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013 3522
3014 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3015 # prepend meta info 3524 cf::face::set_type $idx, $type;
3016 3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else { 3526 } else {
3024 $data = $info->{data}; 3527# $RESOURCE{$name} = $info; # unused
3025 } 3528 }
3026 3529
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3530 cf::cede_to_tick;
3031 } 3531 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3532 }
3533
3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3535
3052 1 3536 1
3053} 3537}
3054 3538
3055register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3057 3541
3058 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v); 3543 $ns->fx_want ($k, $v);
3060 } 3544 }
3061}; 3545};
3546
3547sub load_resource_file($) {
3548 my $guard = lock_acquire "load_resource_file";
3549
3550 my $status = load_resource_file_ $_[0];
3551 get_slot 0.1, 100;
3552 cf::arch::commit_load;
3553
3554 $status
3555}
3062 3556
3063sub reload_regions { 3557sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework 3558 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?) 3559 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = (); 3560 %ext::player_env::MUSIC_FACE_CACHE = ();
3080} 3574}
3081 3575
3082sub reload_archetypes { 3576sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes" 3577 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n"; 3578 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090} 3579}
3091 3580
3092sub reload_treasures { 3581sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3095} 3584}
3096 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3097sub reload_resources { 3606sub reload_resources {
3098 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3099 3608
3609 reload_exp_table;
3610 reload_materials;
3611 reload_facedata;
3612 reload_sound;
3613 reload_archetypes;
3100 reload_regions; 3614 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures; 3615 reload_treasures;
3105 3616
3106 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3107}
3108
3109sub init {
3110 reload_resources;
3111} 3618}
3112 3619
3113sub reload_config { 3620sub reload_config {
3114 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3115 or return;
3116 3622
3117 local $/; 3623 my $config = load_file "$CONFDIR/config";
3118 *CFG = YAML::Syck::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3119 3626
3120 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3121 3628
3122 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3123 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3124 3631
3125 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3129 }; 3636 };
3130 warn $@ if $@; 3637 warn $@ if $@;
3131 } 3638 }
3132} 3639}
3133 3640
3641sub pidfile() {
3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3643 or die "$PIDFILE: $!";
3644 flock $fh, &Fcntl::LOCK_EX
3645 or die "$PIDFILE: flock: $!";
3646 $fh
3647}
3648
3649# make sure only one server instance is running at any one time
3650sub atomic {
3651 my $fh = pidfile;
3652
3653 my $pid = <$fh>;
3654 kill 9, $pid if $pid > 0;
3655
3656 seek $fh, 0, 0;
3657 print $fh $$;
3658}
3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
3134sub main { 3669sub main {
3670 cf::init_globals; # initialise logging
3671
3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676
3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678
3135 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3681 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3682 (async {
3139 Event::one_event; 3683 $Coro::current->{desc} = "IDLE BUG HANDLER";
3684 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3685 })->prio (Coro::PRIO_MAX);
3141 }; 3686 };
3142 3687
3688 evthread_start IO::AIO::poll_fileno;
3689
3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3699 reload_resources;
3143 reload_config; 3700 reload_config;
3144 db_init; 3701 db_init;
3702
3703 cf::init_uuid;
3704 cf::init_signals;
3705 cf::init_skills;
3706
3707 cf::init_beforeplay;
3708
3709 atomic;
3710
3145 load_extensions; 3711 load_extensions;
3146 3712
3147 $TICK_WATCHER->start; 3713 utime time, time, $RUNTIMEFILE;
3148 Event::loop; 3714
3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3718
3719 cf::_post_init 0;
3720 };
3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
3149} 3730}
3150 3731
3151############################################################################# 3732#############################################################################
3152# initialisation and cleanup 3733# initialisation and cleanup
3153 3734
3154# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3155BEGIN { 3736BEGIN {
3737 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3164 },
3165 ); 3741 };
3166 } 3742 }
3167} 3743}
3168 3744
3169sub write_runtime { 3745sub write_runtime_sync {
3170 my $runtime = "$LOCALDIR/runtime"; 3746 my $t0 = AE::time;
3171 3747
3172 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3174 3750
3175 IO::AIO::aio_utime $runtime, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3176 3752
3177 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3178 3754
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3180 or return; 3756 or return;
3181 3757
3182 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3194 aio_utime $fh, undef, undef; 3770 aio_utime $fh, undef, undef;
3195 3771
3196 close $fh 3772 close $fh
3197 or return; 3773 or return;
3198 3774
3199 aio_rename "$runtime~", $runtime 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3200 and return; 3776 and return;
3201 3777
3202 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3203 3779
3204 1 3780 1
3781}
3782
3783our $uuid_lock;
3784our $uuid_skip;
3785
3786sub write_uuid_sync($) {
3787 $uuid_skip ||= $_[0];
3788
3789 return if $uuid_lock;
3790 local $uuid_lock = 1;
3791
3792 my $uuid = "$LOCALDIR/uuid";
3793
3794 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3795 or return;
3796
3797 my $value = uuid_seq uuid_cur;
3798
3799 unless ($value) {
3800 info "cowardly refusing to write zero uuid value!\n";
3801 return;
3802 }
3803
3804 my $value = uuid_str $value + $uuid_skip;
3805 $uuid_skip = 0;
3806
3807 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3808 and return;
3809
3810 # always fsync - this file is important
3811 aio_fsync $fh
3812 and return;
3813
3814 close $fh
3815 or return;
3816
3817 aio_rename "$uuid~", $uuid
3818 and return;
3819
3820 trace "uuid file written ($value).\n";
3821
3822 1
3823
3824}
3825
3826sub write_uuid($$) {
3827 my ($skip, $sync) = @_;
3828
3829 $sync ? write_uuid_sync $skip
3830 : async { write_uuid_sync $skip };
3205} 3831}
3206 3832
3207sub emergency_save() { 3833sub emergency_save() {
3208 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3209 3835
3210 warn "enter emergency perl save\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3211 3842
3212 cf::sync_job { 3843 cf::sync_job {
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3213 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3214 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3215 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3217 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3852 $pl->valid or next;
3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3854 $pl->save;
3221 } 3855 }
3222 warn "end emergency player save\n"; 3856 info "emergency_perl_save: end player save\n";
3223 3857
3224 warn "begin emergency map save\n"; 3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3860 info "emergency_perl_save: begin map save\n";
3225 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3226 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3227 $map->valid or next; 3863 $map->valid or next;
3228 $map->save; 3864 $map->save;
3229 } 3865 }
3230 warn "end emergency map save\n"; 3866 info "emergency_perl_save: end map save\n";
3231 3867
3232 warn "begin emergency database checkpoint\n"; 3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3870 info "emergency_perl_save: begin database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3873
3874 info "emergency_perl_save: begin write uuid\n";
3875 write_uuid_sync 1;
3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3235 }; 3896 };
3236 3897
3237 warn "leave emergency perl save\n"; 3898 info "emergency_perl_save: leave\n";
3238} 3899}
3239 3900
3240sub post_cleanup { 3901sub post_cleanup {
3241 my ($make_core) = @_; 3902 my ($make_core) = @_;
3242 3903
3904 IO::AIO::flush;
3905
3243 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3244 if $make_core; 3907 if $make_core;
3908
3909 my $fh = pidfile;
3910 unlink $PIDFILE if <$fh> == $$;
3911}
3912
3913# a safer delete_package, copied from Symbol
3914sub clear_package($) {
3915 my $pkg = shift;
3916
3917 # expand to full symbol table name if needed
3918 unless ($pkg =~ /^main::.*::$/) {
3919 $pkg = "main$pkg" if $pkg =~ /^::/;
3920 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3921 $pkg .= '::' unless $pkg =~ /::$/;
3922 }
3923
3924 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3925 my $stem_symtab = *{$stem}{HASH};
3926
3927 defined $stem_symtab and exists $stem_symtab->{$leaf}
3928 or return;
3929
3930 # clear all symbols
3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3932 for my $name (keys %$leaf_symtab) {
3933 _gv_clear *{"$pkg$name"};
3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3935 }
3245} 3936}
3246 3937
3247sub do_reload_perl() { 3938sub do_reload_perl() {
3248 # can/must only be called in main 3939 # can/must only be called in main
3249 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3250 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3251 return; 3942 return;
3252 } 3943 }
3253 3944
3254 warn "reloading..."; 3945 return if $RELOAD++;
3255 3946
3256 warn "entering sync_job"; 3947 my $t1 = AE::time;
3257 3948
3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3952
3953 trace "perl_reload: entering sync_job";
3954
3258 cf::sync_job { 3955 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark
3260 cf::emergency_save; 3956 #cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark
3262 3957
3263 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV;
3265
3266 # if anything goes wrong in here, we should simply crash as we already saved
3267
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests";
3274 for (;;) {
3275 BDB::flush;
3276 IO::AIO::flush;
3277 Coro::cede;
3278 last unless IO::AIO::nreqs || BDB::nreqs;
3279 warn "iterate...";
3280 }
3281
3282 ++$RELOAD;
3283
3284 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3285 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3286 %EXT_CORO = (); 3960 %EXT_CORO = ();
3287 3961
3288 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3289 %COMMAND = (); 3963 %COMMAND = ();
3290 3964
3291 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3292 %EXTCMD = (); 3966 %EXTCMD = ();
3293 %EXTICMD = (); 3967 %EXTICMD = ();
3294 3968
3295 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3296 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3297 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3298 3972
3299 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3300 eval { 3974 eval {
3301 $cb->($pkg); 3975 $cb->($pkg);
3302 1 3976 1
3303 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3978 }
3979
3980 trace "... clearing $pkg";
3981 clear_package $pkg;
3304 } 3982 }
3305 3983
3306 warn "... nuking $pkg";
3307 Symbol::delete_package $pkg;
3308 }
3309
3310 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3311 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3312 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3313 3987
3314 warn "... unloading $k"; 3988 trace "... unloading $k";
3315 delete $INC{$k}; 3989 delete $INC{$k};
3316 3990
3317 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3318 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3319 3993
3320 if (my $cb = $k->can ("unload_module")) { 3994 if (my $cb = $k->can ("unload_module")) {
3321 $cb->(); 3995 $cb->();
3996 }
3997
3998 clear_package $k;
3322 } 3999 }
3323 4000
3324 Symbol::delete_package $k;
3325 }
3326
3327 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3328 Symbol::delete_package "safe::$_" 4002 clear_package "safe::$_"
3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3330 4004
3331 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3332 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3334 4008
3335 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3336 # and global variables created in xs 4010 # and global variables created in xs
3337 #Symbol::delete_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3338 4012
3339 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3340 4014
3341 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3342 require cf; 4016 require cf;
3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3344 4018
3345 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3346 cf::reload_config; 4020 cf::reload_config;
3347 4021
3348 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3349 cf::load_extensions; 4023 cf::load_extensions;
3350 4024
4025 if ($REATTACH_ON_RELOAD) {
3351 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3352 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3353 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3354 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3356 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
4032 }
3357 4033
3358 warn "leaving sync_job"; 4034 cf::_post_init 1;
3359 4035
4036 trace "perl_reload: leaving sync_job";
4037
3360 1 4038 1
3361 } or do { 4039 } or do {
3362 warn $@; 4040 error $@;
3363 warn "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3364 exit 1; 4042 };
4043
4044 --$RELOAD;
3365 }; 4045 }
3366 4046
3367 warn "reloaded"; 4047 $t1 = AE::time - $t1;
4048 info "perl_reload: completed in ${t1}s\n";
3368}; 4049};
3369 4050
3370our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3371 4052
3372sub reload_perl() { 4053sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 4054 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3375 4056
3376 $RELOAD_WATCHER ||= Event->timer ( 4057 $RELOAD_WATCHER ||= cf::async {
3377 reentrant => 0, 4058 Coro::AIO::aio_wait cache_extensions;
3378 after => 0, 4059
3379 data => WF_AUTOCANCEL, 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3380 cb => sub {
3381 do_reload_perl; 4061 do_reload_perl;
3382 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3383 }, 4063 };
3384 ); 4064 };
3385} 4065}
3386 4066
3387register_command "reload" => sub { 4067register_command "reload" => sub {
3388 my ($who, $arg) = @_; 4068 my ($who, $arg) = @_;
3389 4069
3390 if ($who->flag (FLAG_WIZ)) { 4070 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 4071 $who->message ("reloading server.");
4072 async {
4073 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 4074 reload_perl;
4075 };
3393 } 4076 }
3394}; 4077};
3395 4078
3396unshift @INC, $LIBDIR; 4079#############################################################################
3397 4080
3398my $bug_warning = 0; 4081my $bug_warning = 0;
3399 4082
3400our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN;
3402
3403sub wait_for_tick { 4083sub wait_for_tick() {
3404 return unless $TICK_WATCHER->is_active; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3405 return if $Coro::current == $Coro::main;
3406 4085
3407 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3408 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait;
3410} 4087}
3411 4088
3412sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3413 return unless $TICK_WATCHER->is_active; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3414 return if $Coro::current == $Coro::main;
3415 4091
3416 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 4094 $signal->wait;
3419} 4095}
3420 4096
3421 my $min = 1e6;#d# 4097sub tick {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 4098 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3433 return; 4101 return;
3434 } 4102 }
3435 4103
3436 $NOW = $tick_start = Event::time; 4104 cf::one_tick; # one server iteration
3437 4105
3438 cf::server_tick; # one server iteration 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3439 4107
3440 0 && sync_job {#d# 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3441 for(1..10) { 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3442 my $t = Event::time; 4110 Coro::async_pool {
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4111 $Coro::current->{desc} = "runtime saver";
3444 or die; 4112 write_runtime_sync
3445 4113 or error "ERROR: unable to write runtime file: $!";
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 4114 };
4115 }
3462 4116
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 4118 $sig->send;
3479 } 4119 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3481 $sig->send;
3482 }
3483 4121
3484 $NOW = Event::time; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 4124
3495 _post_tick; 4125 if (0) {
3496 4126 if ($NEXT_TICK) {
3497 4127 my $jitter = $TICK_START - $NEXT_TICK;
4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4129 debug "jitter $JITTER\n";#d#
4130 }
3498 }, 4131 }
3499); 4132}
3500 4133
3501{ 4134{
3502 BDB::max_poll_time $TICK * 0.1; 4135 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 4136
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3512 4138 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 4140
3528 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 4148
3531 cf::sync_job { 4149 cf::sync_job {
3532 eval { 4150 eval {
3533 BDB::db_env_open 4151 BDB::db_env_open
3534 $DB_ENV, 4152 $DB_ENV,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4154 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4155 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 4156 0666;
3539 4157
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4158 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 4159 };
3545 4160
3546 cf::cleanup "db_env_open(db): $@" if $@; 4161 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 4162 };
3548 } 4163 }
4164
4165 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4166 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4167 };
4168 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 };
3549} 4174}
3550 4175
3551{ 4176{
4177 # configure IO::AIO
4178
3552 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 4181 undef $AnyEvent::AIO::WATCHER;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 4182}
3565 4183
3566my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3567 4186
3568sub _log_backtrace { 4187sub _log_backtrace {
3569 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3570 4189
3571 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3572 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3573 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3575 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3576 async { 4200 async {
4201 $Coro::current->{desc} = "abt $msg";
4202
3577 my @bt = fork_call { 4203 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 4207 or die "addr2line: $!";
3589 } 4215 }
3590 4216
3591 @funcs 4217 @funcs
3592 }; 4218 };
3593 4219
3594 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3595 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3596 --$_log_backtrace; 4223 --$_log_backtrace;
3597 }; 4224 };
3598 } else { 4225 } else {
3599 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3600 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3601 } 4228 }
3602} 4229}
3603 4230
3604# load additional modules 4231# load additional modules
3605use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3606 4234
3607END { cf::emergency_save } 4235END { cf::emergency_save }
3608 4236
36091 42371
3610 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines