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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
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
1318 1640
1319sub exists($) { 1641sub exists($) {
1320 my ($login) = @_; 1642 my ($login) = @_;
1321 1643
1322 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1324} 1646}
1325 1647
1326sub find($) { 1648sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1650 my $login = $_[0];
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1661
1340 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1663 or return;
1342 1664
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1345 or return; 1666 or return;
1667
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1349 } 1671 }
1350 } 1672 }
1351} 1673}
1352 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
1353sub save($) { 1688sub save($) {
1354 my ($pl) = @_; 1689 my ($pl) = @_;
1355 1690
1356 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1357 1692
1360 1695
1361 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1362 1697
1363 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1364 $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];
1365 1705
1366 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1707 cf::cede_to_tick;
1368} 1708}
1369 1709
1401 my ($pl) = @_; 1741 my ($pl) = @_;
1402 1742
1403 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1404 1744
1405 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1406 $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
1407 1747
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1409 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1411 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1412 1756
1413 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1415 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1453 1797
1454 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1455 my $path = path $login; 1799 my $path = path $login;
1456 1800
1457 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1807 }
1463 1808
1467 1812
1468 \@logins 1813 \@logins
1469} 1814}
1470 1815
1471=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1472 1819
1473Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1474player. May block. 1821player. May block.
1475 1822
1476=cut 1823=cut
1494 } 1841 }
1495 1842
1496 \@paths 1843 \@paths
1497} 1844}
1498 1845
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1847
1501Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549 1849
1550=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1551 1851
1552Sends an ext reply to the player. 1852Sends an ext reply to the player.
1553 1853
1585 1885
1586=cut 1886=cut
1587 1887
1588sub find_by_path($) { 1888sub find_by_path($) {
1589 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1590 1892
1591 my ($match, $specificity); 1893 my ($match, $specificity);
1592 1894
1593 for my $region (list) { 1895 for my $region (list) {
1594 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1620our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1622 1924
1623sub generate_random_map { 1925sub generate_random_map {
1624 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1625 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1626 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1630 $rmp->{exit_on_final_map},
1631 $rmp->{xsize}, $rmp->{ysize},
1632 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1633 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1634 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1635 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1636 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1637 (cf::region::find $rmp->{region}), $rmp->{custom}
1638 )
1639} 1931}
1640 1932
1641=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1642 1934
1643Register 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
1648 1940
1649sub register { 1941sub register {
1650 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1651 my $pkg = caller; 1943 my $pkg = caller;
1652 1944
1653 no strict;
1654 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1655 1946
1656 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1657} 1948}
1658 1949
1659# also paths starting with '/' 1950# also paths starting with '/'
1660$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1661 1952
1662sub thawer_merge { 1953sub thawer_merge {
1663 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1664 1955
1665 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1670} 1961}
1671 1962
1672sub normalise { 1963sub normalise {
1673 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1674 1965
1675 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1676 1967
1677 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1678 1969
1679 # map plan: 1970 # map plan:
1680 # 1971 #
1695 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1696 $path = "$base/$path"; 1987 $path = "$base/$path";
1697 } 1988 }
1698 1989
1699 for ($path) { 1990 for ($path) {
1700 redo if s{//}{/};
1701 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1702 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1703 } 1993 }
1704 1994
1705 $path 1995 $path
1719 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1720 return $self; 2010 return $self;
1721 } 2011 }
1722 } 2012 }
1723 2013
1724 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1725 () 2015 ()
1726} 2016}
1727 2017
2018# may re-bless or do other evil things
1728sub init { 2019sub init {
1729 my ($self) = @_; 2020 my ($self) = @_;
1730 2021
1731 $self 2022 $self
1732} 2023}
1751 2042
1752# the temporary/swap location 2043# the temporary/swap location
1753sub save_path { 2044sub save_path {
1754 my ($self) = @_; 2045 my ($self) = @_;
1755 2046
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1758} 2049}
1759 2050
1760# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1761sub uniq_path { 2052sub uniq_path {
1762 my ($self) = @_; 2053 my ($self) = @_;
1763 2054
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1766}
1767
1768# and all this just because we cannot iterate over
1769# all maps in C++...
1770sub change_all_map_light {
1771 my ($change) = @_;
1772
1773 $_->change_map_light ($change)
1774 for grep $_->outdoor, values %cf::MAP;
1775} 2057}
1776 2058
1777sub decay_objects { 2059sub decay_objects {
1778 my ($self) = @_; 2060 my ($self) = @_;
1779 2061
1806 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1807 2089
1808 1 2090 1
1809} 2091}
1810 2092
2093# used to laod the header of an original map
1811sub load_header_orig { 2094sub load_header_orig {
1812 my ($self) = @_; 2095 my ($self) = @_;
1813 2096
1814 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1815} 2098}
1816 2099
2100# used to laod the header of an instantiated map
1817sub load_header_temp { 2101sub load_header_temp {
1818 my ($self) = @_; 2102 my ($self) = @_;
1819 2103
1820 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1821} 2105}
1822 2106
2107# called after loading the header from an instantiated map
1823sub prepare_temp { 2108sub prepare_temp {
1824 my ($self) = @_; 2109 my ($self) = @_;
1825 2110
1826 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1827 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1828 # safety 2113 # safety
1829 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1830 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1831} 2116}
1832 2117
2118# called after loading the header from an original map
1833sub prepare_orig { 2119sub prepare_orig {
1834 my ($self) = @_; 2120 my ($self) = @_;
1835 2121
1836 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1837 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1861 2147
1862sub find; 2148sub find;
1863sub find { 2149sub find {
1864 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1865 2151
2152 cf::cede_to_tick;
2153
1866 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1867 2155
1868 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1870 2158
1871 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1875 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1876 or return; 2161 or return;
1877 2162
1878 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1879 2164
1881 or return; 2166 or return;
1882 2167
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
1886 undef $guard1; 2172 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 2173 $map->reset;
1889 return find $path; 2174 return find $path;
1890 } 2175 }
1891 2176
1892 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1893 } 2178 }
1894} 2179}
1895 2180
1896sub pre_load { } 2181sub pre_load { }
1897sub post_load { } 2182#sub post_load { } # XS
1898 2183
1899sub load { 2184sub load {
1900 my ($self) = @_; 2185 my ($self) = @_;
1901 2186
1902 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1905 2190
1906 { 2191 {
1907 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1908 2193
1909 return unless $self->valid; 2194 return unless $self->valid;
1910 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1911
1912 $self->in_memory (cf::MAP_LOADING);
1913 2196
1914 $self->alloc; 2197 $self->alloc;
1915 2198
1916 $self->pre_load; 2199 $self->pre_load;
1917 cf::cede_to_tick; 2200 cf::cede_to_tick;
1918 2201
2202 if (exists $self->{load_path}) {
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2204 $f->skip_block;
1921 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
1922 or return; 2206 or return;
1923 2207
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1925 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1926 2210
1927 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2212 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1931 $self->clear_unique_items; 2215 $self->clear_unique_items;
1932 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
1934 } 2219 }
1935 } 2220 }
1936 }
1937 2221
1938 $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);
1939 2229
1940 cf::cede_to_tick; 2230 cf::cede_to_tick;
1941 # now do the right thing for maps 2231 # now do the right thing for maps
1942 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1943 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1947 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1948 $self->decay_objects; 2238 $self->decay_objects;
1949 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1950 $self->update_buttons; 2240 $self->update_buttons;
1951 cf::cede_to_tick; 2241 cf::cede_to_tick;
1952 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1953 cf::cede_to_tick;
1954 $self->activate;
1955 } 2243 }
1956 2244
1957 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
1959
1960 $self->in_memory (cf::MAP_IN_MEMORY);
1961 } 2247 }
1962 2248
1963 $self->post_load; 2249 $self->post_load;
1964}
1965 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
1966sub customise_for { 2257sub customise_for {
1967 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1968 2259
1969 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1970 if $self->per_player; 2261 if $self->per_player;
1973# if $self->per_party; 2264# if $self->per_party;
1974 2265
1975 $self 2266 $self
1976} 2267}
1977 2268
1978# find and load all maps in the 3x3 area around a map
1979sub load_neighbours {
1980 my ($map) = @_;
1981
1982 my @neigh; # diagonal neighbours
1983
1984 for (0 .. 3) {
1985 my $neigh = $map->tile_path ($_)
1986 or next;
1987 $neigh = find $neigh, $map
1988 or next;
1989 $neigh->load;
1990
1991 push @neigh,
1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1994 }
1995
1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1998 my $neigh = find $path, $origin
1999 or next;
2000 $neigh->load;
2001 }
2002}
2003
2004sub find_sync { 2269sub find_sync {
2005 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2006 2271
2007 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
2008} 2277}
2009 2278
2010sub do_load_sync { 2279sub do_load_sync {
2011 my ($map) = @_; 2280 my ($map) = @_;
2012 2281
2282 # it's a bug to call this from the main context
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2015 2285
2016 cf::sync_job { $map->load }; 2286 $map->load;
2017} 2287}
2018 2288
2019our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2020our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2021 2291
2022sub find_async { 2292sub find_async {
2023 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2024 2294
2025 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2026 2296
2027 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2029 } 2299 }
2030 2300
2031 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2032 2302
2033 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
2034 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2308 if (my $map = find $k) {
2037 $map->load if $v; 2309 $map->load if $v;
2038 } 2310 }
2045 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2046 2318
2047 () 2319 ()
2048} 2320}
2049 2321
2322# common code, used by both ->save and ->swapout
2050sub save { 2323sub _save {
2051 my ($self) = @_; 2324 my ($self) = @_;
2052
2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
2054 2325
2055 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2056 2327
2057 return unless $self->dirty; 2328 return unless $self->dirty;
2058 2329
2064 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2065 2336
2066 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
2067 2338
2068 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2070 }; 2342 };
2343
2344 cf::get_slot 0.02;
2071 2345
2072 if ($uniq) { 2346 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2349 } else {
2076 $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);
2077 } 2351 }
2078} 2352}
2079 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2080sub swap_out { 2362sub swap_out {
2081 my ($self) = @_; 2363 my ($self) = @_;
2082 2364
2083 # save first because save cedes
2084 $self->save;
2085
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2088 return if $self->players; 2369 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY; 2370
2371 # first deactivate the map and "unlink" it from the core
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
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2090 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2091 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2092 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2093 2421
2094 $self->deactivate; 2422 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2096 $self->clear; 2424 $self->clear;
2097}
2098
2099sub reset_at {
2100 my ($self) = @_;
2101
2102 # TODO: safety, remove and allow resettable per-player maps
2103 return 1e99 if $self->{deny_reset};
2104
2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2107
2108 $time + $to
2109}
2110
2111sub should_reset {
2112 my ($self) = @_;
2113
2114 $self->reset_at <= $cf::RUNTIME
2115}
2116
2117sub reset {
2118 my ($self) = @_;
2119
2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
2121
2122 return if $self->players;
2123
2124 warn "resetting map ", $self->path;
2125
2126 $self->in_memory (cf::MAP_SWAPPED);
2127
2128 # need to save uniques path
2129 unless ($self->{deny_save}) {
2130 my $uniq = $self->uniq_path; utf8::encode $uniq;
2131
2132 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2133 if $uniq;
2134 }
2135
2136 delete $cf::MAP{$self->path};
2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2140 $self->clear;
2141 2425
2142 $self->unlink_save; 2426 $self->unlink_save;
2143 $self->destroy; 2427 $self->destroy;
2144} 2428}
2145 2429
2153 2437
2154 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2155 2439
2156 $self->unlink_save; 2440 $self->unlink_save;
2157 2441
2158 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2159 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2160 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2161 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2163 2447
2212 2496
2213sub unique_maps() { 2497sub unique_maps() {
2214 [ 2498 [
2215 map { 2499 map {
2216 utf8::decode $_; 2500 utf8::decode $_;
2217 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2218 ? normalise $_ 2504 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2506 ]
2222} 2507}
2223 2508
2224package 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}
2225 2540
2226=back 2541=back
2227 2542
2228=head3 cf::object 2543=head3 cf::object
2229 2544
2233 2548
2234=over 4 2549=over 4
2235 2550
2236=item $ob->inv_recursive 2551=item $ob->inv_recursive
2237 2552
2238Returns 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.
2239 2555
2240=cut 2556=cut
2241 2557
2242sub inv_recursive_; 2558sub inv_recursive_;
2243sub inv_recursive_ { 2559sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2249} 2565}
2250 2566
2251=item $ref = $ob->ref 2567=item $ref = $ob->ref
2252 2568
2253creates 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.
2254 2570
2255=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2256 2572
2257returns 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,
2258even if the object actually exists. May block. 2574even if the object actually exists. May block.
2260=cut 2576=cut
2261 2577
2262sub deref { 2578sub deref {
2263 my ($ref) = @_; 2579 my ($ref) = @_;
2264 2580
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2581 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2582 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2583 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2584 or return;
2272 $pl->ob->uuid eq $uuid 2585 $pl->ob->uuid eq $uuid
2273 or return; 2586 or return;
2293can 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
2294dialogue with the given NPC character. 2607dialogue with the given NPC character.
2295 2608
2296=cut 2609=cut
2297 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
2298# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2626# with dialog boxes.
2300#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
2301sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2314 $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));
2315 2642
2316 } else { 2643 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2646 }
2320 } 2647 }
2321} 2648}
2322 2649
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2348 2675
2349=item $player_object->enter_link 2676=item $player_object->enter_link
2350 2677
2351Freezes 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}>).
2352 2679
2353The 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.
2354I<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.
2355 2684
2356Will never block. 2685Will never block.
2357 2686
2358=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2359 2688
2379sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2380 my ($self) = @_; 2709 my ($self) = @_;
2381 2710
2382 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2383 2712
2713 ++$self->{_link_recursion};
2714
2384 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2385 2716
2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2387 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2388 2719
2389 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2390} 2721}
2391 2722
2392sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2393 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2394 2725
2411 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2412 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2413 2744
2414 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2415 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2416 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2417 2748
2418 $map->load; 2749 $map->load;
2419 $map->load_neighbours;
2420 2750
2421 return unless $self->contr->active; 2751 return unless $self->contr->active;
2422 $self->activate_recursive;
2423 2752
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2426} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2427 2760
2761}
2762
2428=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)]])
2429 2764
2430Moves 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
2431her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2432that 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
2433the 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
2434be called at the end of this process. 2769be called at the end of this process.
2435 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
2436=cut 2774=cut
2437 2775
2438our $GOTOGEN; 2776our $GOTOGEN;
2439 2777
2440sub cf::object::player::goto { 2778sub cf::object::player::goto {
2441 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2442 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
2443 # 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
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2789
2446 $self->enter_link; 2790 $self->enter_link;
2447 2791
2448 (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
2449 my $map = eval { 2814 my $map = eval {
2450 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2451 2816
2452 if ($map) { 2817 if ($map) {
2453 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2455 } else { 2820 } else {
2456 $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);
2457 } 2822 }
2458 2823
2459 $map 2824 $map
2460 }; 2825 };
2461 2826
2467 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2469 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2470 } 2835 }
2471 2836
2472 $done->() if $done; 2837 $done->($self) if $done;
2473 })->prio (1); 2838 })->prio (1);
2474} 2839}
2475 2840
2476=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2477 2842
2497} 2862}
2498 2863
2499sub prepare_random_map { 2864sub prepare_random_map {
2500 my ($exit) = @_; 2865 my ($exit) = @_;
2501 2866
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2869 # that depends on the exit object
2507 2870
2508 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2873 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2515 } 2880 }
2516 2881
2517 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2518 2883
2519 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2522 2887
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2890 undef $fh;
2526 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2527 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2530 } 2899 }
2531} 2900}
2532 2901
2533sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2535 2904
2536 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2537 2906
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
2549 $self->enter_link; 2907 $self->enter_link;
2550 2908
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2555 (async { 2909 (async {
2556 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2557 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
2558 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2559 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
2560 1; 2948 1
2561 }) { 2949 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "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. "
2564 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2954
2567 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2568 $self->leave_link; 2956 $self->leave_link;
2569 } 2957 }
2570 })->prio (1); 2958 })->prio (1);
2571} 2959}
2572 2960
2584sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2585 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2586 2974
2587 utf8::encode $text; 2975 utf8::encode $text;
2588 $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);
2589} 3002}
2590 3003
2591=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2592 3005
2593Send 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
2595the 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
2596the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2597 3010
2598=cut 3011=cut
2599 3012
3013# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2601 "c/identify" => { 3021 "c/identify" => {
2602 id => "identify", 3022 id => "infobox",
2603 title => "Identify", 3023 title => "Identify",
2604 reply => undef, 3024 reply => undef,
2605 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2606 }, 3026 },
2607 "c/examine" => { 3027 "c/examine" => {
2608 id => "examine", 3028 id => "infobox",
2609 title => "Examine", 3029 title => "Examine",
2610 reply => undef, 3030 reply => undef,
2611 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
2612 }, 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,
2613); 3125);
2614 3126
2615sub cf::client::send_msg { 3127sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2617 3129
2618 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2619 3132
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 3134
2622 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3136 if ($CHANNEL{$channel}) {
3137 $channel = $CHANNEL{$channel};
2624 3138
3139 $self->ext_msg (channel_info => $channel);
3140 $channel = $channel->{id};
3141
2625 if (ref $channel) { 3142 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2630 if $self->can_msg;
2631 } 3147 }
2632 3148
2633 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2634 } 3150 }
2635 3151
2636 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2637 3153
2638 if ($self->can_msg) {
2639 # default colour, mask it out 3154 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2642 3157
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2645 } else { 3161 );
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656 3162
2657 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670} 3164}
2671 3165
2672=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2673 3167
2674Sends an ext event to the client. 3168Sends an ext event to the client.
2677 3171
2678sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2680 3174
2681 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 } 3180 }
2687} 3181}
2688 3182
2689=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2690 3184
2693=cut 3187=cut
2694 3188
2695sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2697 3191
2698 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2705} 3195}
2706 3196
2707=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2708 3198
2709Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2764 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2765 3255
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767 3257
2768 if (ref $msg) { 3258 if (ref $msg) {
2769 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773 3260
2774 my @reply; 3261 my @reply;
2775 3262
2776 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2779 3266
2780 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2781 if $reply; 3268 if $reply;
2782 3269
2783 } else { 3270 } else {
2784 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";
2785 } 3272 }
2786 3273
2787 cf::override; 3274 cf::override;
2788 }, 3275 },
2789); 3276);
2809 3296
2810 $coro 3297 $coro
2811} 3298}
2812 3299
2813cf::client->attach ( 3300cf::client->attach (
2814 on_destroy => sub { 3301 on_client_destroy => sub {
2815 my ($ns) = @_; 3302 my ($ns) = @_;
2816 3303
2817 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2818 }, 3305 },
2819); 3306);
2835our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2836 3323
2837$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2838 3325
2839$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
2841 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
2842 sort time 3329 sort time
2843)); 3330));
2844 3331
2845# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2847=pod 3334=pod
2848 3335
2849The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2850 3337
2851 cf::object 3338 cf::object
2852 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
2853 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
2854 3342
2855 cf::object::player 3343 cf::object::player
2856 player 3344 player
2857 3345
2858 cf::player 3346 cf::player
2863 3351
2864=cut 3352=cut
2865 3353
2866for ( 3354for (
2867 ["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
2868 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3357 decrease split destroy change_exp value msg lore send_msg)],
2870 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2872 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2873) { 3361) {
2874 no strict 'refs';
2875 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2876 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2877 for @funs; 3364 for @funs;
2878} 3365}
2879 3366
2894 3381
2895 my $qcode = $code; 3382 my $qcode = $code;
2896 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2897 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2898 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2899 local $_; 3389 local $_;
2900 local @safe::cf::_safe_eval_args = values %vars;
2901 3390
2902 my $eval = 3391 my $eval =
2903 "do {\n" 3392 "do {\n"
2904 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2905 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2906 . $code 3395 . $code
2907 . "\n}" 3396 . "\n}"
2908 ; 3397 ;
2909 3398
3399 if ($CFG{safe_eval}) {
2910 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2911 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2912 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 }
2913 3408
2914 if ($@) { 3409 if ($@) {
2915 warn "$@"; 3410 warn "$@",
2916 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2917 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2918 } 3413 }
2919 3414
2920 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2921} 3416}
2922 3417
2936=cut 3431=cut
2937 3432
2938sub register_script_function { 3433sub register_script_function {
2939 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2940 3435
2941 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2942 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2943} 3438}
2944 3439
2945=back 3440=back
2946 3441
2947=cut 3442=cut
2956 # for this (global event?) 3451 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
2958 3453
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960 3455
2961 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2962 3457
2963 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2964 0 < aio_load $path, $facedata
2965 or die "$path: $!";
2966
2967 $facedata = Coro::Storable::thaw $facedata;
2968 3459
2969 $facedata->{version} == 2 3460 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971 3462
2972 # 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]);
2973 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC, 3466 type => FT_RSRC,
2975 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),
2976 }; 3469 };
2977 cf::cede_to_tick; 3470 cf::cede_to_tick;
2978 3471
2979 { 3472 {
2980 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2981 3474
2982 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2984 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2987 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} ;
2988 3483
2989 cf::cede_to_tick; 3484 cf::cede_to_tick;
2990 } 3485 }
2991 3486
2992 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2994 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2995 or next; 3491 or next;
3492
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3496 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3001 } 3498 }
3002 3499
3003 cf::cede_to_tick; 3500 cf::cede_to_tick;
3004 } 3501 }
3005 } 3502 }
3014 3511
3015 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3016 } 3513 }
3017 3514
3018 { 3515 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3022 3517
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3519 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028 3521
3029 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3030 # prepend meta info 3523 cf::face::set_type $idx, $info->{type};
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else { 3524 } else {
3039 $data = $info->{data}; 3525 $RESOURCE{$name} = $info; # unused
3040 } 3526 }
3041 3527
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3528 cf::cede_to_tick;
3046 } 3529 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3530 }
3531
3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3533
3067 1 3534 1
3068} 3535}
3069 3536
3070register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3072 3539
3073 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3541 $ns->fx_want ($k, $v);
3075 } 3542 }
3076}; 3543};
3544
3545sub load_resource_file($) {
3546 my $guard = lock_acquire "load_resource_file";
3547
3548 my $status = load_resource_file_ $_[0];
3549 get_slot 0.1, 100;
3550 cf::arch::commit_load;
3551
3552 $status
3553}
3077 3554
3078sub reload_regions { 3555sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework 3556 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?) 3557 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3558 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3572}
3096 3573
3097sub reload_archetypes { 3574sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105} 3577}
3106 3578
3107sub reload_treasures { 3579sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3110} 3582}
3111 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3112sub reload_resources { 3604sub reload_resources {
3113 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3114 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
3115 reload_regions; 3612 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3613 reload_treasures;
3120 3614
3121 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3122}
3123
3124sub init {
3125 reload_resources;
3126} 3616}
3127 3617
3128sub reload_config { 3618sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3130 or return;
3131 3620
3132 local $/; 3621 my $config = load_file "$CONFDIR/config";
3133 *CFG = YAML::Syck::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3134 3624
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3136 3626
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3139 3629
3140 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3144 }; 3634 };
3145 warn $@ if $@; 3635 warn $@ if $@;
3146 } 3636 }
3147} 3637}
3148 3638
3639sub pidfile() {
3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3641 or die "$PIDFILE: $!";
3642 flock $fh, &Fcntl::LOCK_EX
3643 or die "$PIDFILE: flock: $!";
3644 $fh
3645}
3646
3647# make sure only one server instance is running at any one time
3648sub atomic {
3649 my $fh = pidfile;
3650
3651 my $pid = <$fh>;
3652 kill 9, $pid if $pid > 0;
3653
3654 seek $fh, 0, 0;
3655 print $fh $$;
3656}
3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3149sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3676
3150 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3680 (async {
3154 Event::one_event; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3682 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3156 }; 3684 };
3157 3685
3686 evthread_start IO::AIO::poll_fileno;
3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3158 reload_config; 3698 reload_config;
3159 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
3160 load_extensions; 3709 load_extensions;
3161 3710
3162 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
3163 Event::loop; 3712
3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3716
3717 cf::_post_init 0;
3718 };
3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3164} 3728}
3165 3729
3166############################################################################# 3730#############################################################################
3167# initialisation and cleanup 3731# initialisation and cleanup
3168 3732
3169# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3170BEGIN { 3734BEGIN {
3735 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3179 },
3180 ); 3739 };
3181 } 3740 }
3182} 3741}
3183 3742
3184sub write_runtime { 3743sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
3186 3745
3187 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3189 3748
3190 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3750
3192 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3193 3752
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3195 or return; 3754 or return;
3196 3755
3197 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
3210 3769
3211 close $fh 3770 close $fh
3212 or return; 3771 or return;
3213 3772
3214 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3774 and return;
3216 3775
3217 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3218 3777
3219 1 3778 1
3779}
3780
3781our $uuid_lock;
3782our $uuid_skip;
3783
3784sub write_uuid_sync($) {
3785 $uuid_skip ||= $_[0];
3786
3787 return if $uuid_lock;
3788 local $uuid_lock = 1;
3789
3790 my $uuid = "$LOCALDIR/uuid";
3791
3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3793 or return;
3794
3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3803 $uuid_skip = 0;
3804
3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3806 and return;
3807
3808 # always fsync - this file is important
3809 aio_fsync $fh
3810 and return;
3811
3812 close $fh
3813 or return;
3814
3815 aio_rename "$uuid~", $uuid
3816 and return;
3817
3818 trace "uuid file written ($value).\n";
3819
3820 1
3821
3822}
3823
3824sub write_uuid($$) {
3825 my ($skip, $sync) = @_;
3826
3827 $sync ? write_uuid_sync $skip
3828 : async { write_uuid_sync $skip };
3220} 3829}
3221 3830
3222sub emergency_save() { 3831sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3224 3833
3225 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3226 3840
3227 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3228 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3229 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3230 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3232 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3850 $pl->valid or next;
3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3852 $pl->save;
3236 } 3853 }
3237 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3238 3855
3239 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
3240 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3241 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3242 $map->valid or next; 3861 $map->valid or next;
3243 $map->save; 3862 $map->save;
3244 } 3863 }
3245 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3246 3865
3247 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3871
3872 info "emergency_perl_save: begin write uuid\n";
3873 write_uuid_sync 1;
3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3250 }; 3894 };
3251 3895
3252 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3253} 3897}
3254 3898
3255sub post_cleanup { 3899sub post_cleanup {
3256 my ($make_core) = @_; 3900 my ($make_core) = @_;
3257 3901
3902 IO::AIO::flush;
3903
3258 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3259 if $make_core; 3905 if $make_core;
3906
3907 my $fh = pidfile;
3908 unlink $PIDFILE if <$fh> == $$;
3909}
3910
3911# a safer delete_package, copied from Symbol
3912sub clear_package($) {
3913 my $pkg = shift;
3914
3915 # expand to full symbol table name if needed
3916 unless ($pkg =~ /^main::.*::$/) {
3917 $pkg = "main$pkg" if $pkg =~ /^::/;
3918 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3919 $pkg .= '::' unless $pkg =~ /::$/;
3920 }
3921
3922 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3923 my $stem_symtab = *{$stem}{HASH};
3924
3925 defined $stem_symtab and exists $stem_symtab->{$leaf}
3926 or return;
3927
3928 # clear all symbols
3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3930 for my $name (keys %$leaf_symtab) {
3931 _gv_clear *{"$pkg$name"};
3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3933 }
3260} 3934}
3261 3935
3262sub do_reload_perl() { 3936sub do_reload_perl() {
3263 # can/must only be called in main 3937 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3265 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3266 return; 3940 return;
3267 } 3941 }
3268 3942
3269 warn "reloading..."; 3943 return if $RELOAD++;
3270 3944
3271 warn "entering sync_job"; 3945 my $t1 = AE::time;
3272 3946
3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3950
3951 trace "perl_reload: entering sync_job";
3952
3273 cf::sync_job { 3953 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark
3275 cf::emergency_save; 3954 #cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark
3277 3955
3278 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV;
3280
3281 # if anything goes wrong in here, we should simply crash as we already saved
3282
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate...";
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = (); 3958 %EXT_CORO = ();
3302 3959
3303 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3304 %COMMAND = (); 3961 %COMMAND = ();
3305 3962
3306 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3307 %EXTCMD = (); 3964 %EXTCMD = ();
3308 %EXTICMD = (); 3965 %EXTICMD = ();
3309 3966
3310 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3311 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3313 3970
3314 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3315 eval { 3972 eval {
3316 $cb->($pkg); 3973 $cb->($pkg);
3317 1 3974 1
3318 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3976 }
3977
3978 trace "... clearing $pkg";
3979 clear_package $pkg;
3319 } 3980 }
3320 3981
3321 warn "... nuking $pkg";
3322 Symbol::delete_package $pkg;
3323 }
3324
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3326 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3985
3329 warn "... unloading $k"; 3986 trace "... unloading $k";
3330 delete $INC{$k}; 3987 delete $INC{$k};
3331 3988
3332 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3334 3991
3335 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3336 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3337 } 3997 }
3338 3998
3339 Symbol::delete_package $k;
3340 }
3341
3342 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 4002
3346 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3349 4006
3350 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3351 # and global variables created in xs 4008 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3353 4010
3354 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3355 4012
3356 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3357 require cf; 4014 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3359 4016
3360 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3361 cf::reload_config; 4018 cf::reload_config;
3362 4019
3363 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3364 cf::load_extensions; 4021 cf::load_extensions;
3365 4022
4023 if ($REATTACH_ON_RELOAD) {
3366 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3369 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3372 4031
3373 warn "leaving sync_job"; 4032 cf::_post_init 1;
3374 4033
4034 trace "perl_reload: leaving sync_job";
4035
3375 1 4036 1
3376 } or do { 4037 } or do {
3377 warn $@; 4038 error $@;
3378 warn "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3379 exit 1; 4040 };
4041
4042 --$RELOAD;
3380 }; 4043 }
3381 4044
3382 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3383}; 4047};
3384 4048
3385our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3386 4050
3387sub reload_perl() { 4051sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3390 4054
3391 $RELOAD_WATCHER ||= Event->timer ( 4055 $RELOAD_WATCHER ||= cf::async {
3392 reentrant => 0, 4056 Coro::AIO::aio_wait cache_extensions;
3393 after => 0, 4057
3394 data => WF_AUTOCANCEL, 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3395 cb => sub {
3396 do_reload_perl; 4059 do_reload_perl;
3397 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3398 }, 4061 };
3399 ); 4062 };
3400} 4063}
3401 4064
3402register_command "reload" => sub { 4065register_command "reload" => sub {
3403 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3404 4067
3405 if ($who->flag (FLAG_WIZ)) { 4068 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 4069 $who->message ("reloading server.");
4070 async {
4071 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 4072 reload_perl;
4073 };
3408 } 4074 }
3409}; 4075};
3410 4076
3411unshift @INC, $LIBDIR; 4077#############################################################################
3412 4078
3413my $bug_warning = 0; 4079my $bug_warning = 0;
3414 4080
3415our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN;
3417
3418sub wait_for_tick { 4081sub wait_for_tick() {
3419 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3420 return if $Coro::current == $Coro::main;
3421 4083
3422 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3423 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait;
3425} 4085}
3426 4086
3427sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3428 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3429 return if $Coro::current == $Coro::main;
3430 4089
3431 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 4092 $signal->wait;
3434} 4093}
3435 4094
3436 my $min = 1e6;#d# 4095sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3448 return; 4099 return;
3449 } 4100 }
3450 4101
3451 $NOW = $tick_start = Event::time; 4102 cf::one_tick; # one server iteration
3452 4103
3453 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3454 4105
3455 0 && sync_job {#d# 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3456 for(1..10) { 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3457 my $t = Event::time; 4108 Coro::async_pool {
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4109 $Coro::current->{desc} = "runtime saver";
3459 or die; 4110 write_runtime_sync
3460 4111 or error "ERROR: unable to write runtime file: $!";
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 4112 };
4113 }
3477 4114
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 4116 $sig->send;
3494 } 4117 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3496 $sig->send;
3497 }
3498 4119
3499 $NOW = Event::time; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 4122
3510 _post_tick; 4123 if (0) {
3511 4124 if ($NEXT_TICK) {
3512 4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
3513 }, 4129 }
3514); 4130}
3515 4131
3516{ 4132{
3517 BDB::max_poll_time $TICK * 0.1; 4133 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 4134
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3527 4136 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 4138
3543 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4146
3546 cf::sync_job { 4147 cf::sync_job {
3547 eval { 4148 eval {
3548 BDB::db_env_open 4149 BDB::db_env_open
3549 $DB_ENV, 4150 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4152 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4153 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 4154 0666;
3554 4155
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4156 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 4157 };
3560 4158
3561 cf::cleanup "db_env_open(db): $@" if $@; 4159 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 4160 };
3563 } 4161 }
4162
4163 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4164 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4165 };
4166 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4167 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4168 };
4169 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4170 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4171 };
3564} 4172}
3565 4173
3566{ 4174{
4175 # configure IO::AIO
4176
3567 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 4179 undef $AnyEvent::AIO::WATCHER;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 4180}
3580 4181
3581my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3582 4184
3583sub _log_backtrace { 4185sub _log_backtrace {
3584 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3585 4187
3586 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3587 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3588 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3590 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3591 async { 4198 async {
4199 $Coro::current->{desc} = "abt $msg";
4200
3592 my @bt = fork_call { 4201 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4203 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4204 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 4205 or die "addr2line: $!";
3604 } 4213 }
3605 4214
3606 @funcs 4215 @funcs
3607 }; 4216 };
3608 4217
3609 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 4221 --$_log_backtrace;
3612 }; 4222 };
3613 } else { 4223 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3616 } 4226 }
3617} 4227}
3618 4228
3619# load additional modules 4229# load additional modules
3620use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3621 4232
3622END { cf::emergency_save } 4233END { cf::emergency_save }
3623 4234
36241 42351
3625 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines