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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines