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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.579 by root, Wed Jan 4 03:22:28 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 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
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
81our $NOW; 138our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 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
1144 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1145 1462
1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1147 1464
1148 if (ref $msg) { 1465 if (ref $msg) {
1149 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1150 "ARRAY" eq ref $msg 1467
1151 ? @$msg 1468 my @reply;
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1469
1154 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1472 }
1473
1474 $pl->ext_reply ($reply, @reply)
1475 if $reply;
1476
1160 } else { 1477 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1479 }
1163 1480
1164 cf::override; 1481 cf::override;
1165 }, 1482 },
1166); 1483);
1167 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1168sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1169 cf::sync_job { 1501 cf::sync_job {
1170 my %todo; 1502 my %todo;
1171 1503
1172 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1173 next unless -r $path; 1505 next unless -r $path;
1191 1523
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1526
1195 $ext{source} = 1527 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1197 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1198 . $source 1530 . $source
1199 . "\n};\n1"; 1531 . "\n};\n1";
1200 1532
1201 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1202 } 1534 }
1203 1535
1536 my $pass = 0;
1204 my %done; 1537 my %done;
1205 while (%todo) { 1538 while (%todo) {
1206 my $progress; 1539 my $progress;
1207 1540
1541 ++$pass;
1542
1543 ext:
1208 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip 1546 next ext
1211 unless exists $done{$_}; 1547 unless exists $done{$_};
1212 } 1548 }
1213 1549
1214 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1215 1551
1216 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1217 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1218 : "$v->{base}: extension inactive.\n";
1219 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1220 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1221 warn $msg; 1559
1222 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1223 exit 1; 1561 delete $todo{$k};
1224 } 1562 } else {
1225 1563 $done{$k} = delete $todo{$k};
1226 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1227 } 1569 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
1232 } 1570 }
1233 1571
1234 skip: 1572 unless ($progress) {
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1236 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1237 } 1582 }
1238 }; 1583 };
1239} 1584}
1240 1585
1241############################################################################# 1586#############################################################################
1242 1587
1243=back 1588=back
1244 1589
1245=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1246 1591
1247Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1248 1593
1249=cut 1594=cut
1250 1595
1251package cf::player; 1596package cf::player;
1252 1597
1253use Coro::AIO; 1598use Coro::AIO;
1254 1599
1255=head3 cf::player 1600=head3 cf::player
1256 1601
1257=over 4 1602=over 4
1603
1604=item cf::player::num_playing
1605
1606Returns the official number of playing players, as per the Crossfire metaserver rules.
1607
1608=cut
1609
1610sub num_playing {
1611 scalar grep
1612 $_->ob->map
1613 && !$_->hidden
1614 && !$_->ob->flag (cf::FLAG_WIZ),
1615 cf::player::list
1616}
1258 1617
1259=item cf::player::find $login 1618=item cf::player::find $login
1260 1619
1261Returns the given player object, loading it if necessary (might block). 1620Returns the given player object, loading it if necessary (might block).
1262 1621
1281 1640
1282sub exists($) { 1641sub exists($) {
1283 my ($login) = @_; 1642 my ($login) = @_;
1284 1643
1285 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1287} 1646}
1288 1647
1289sub find($) { 1648sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1650 my $login = $_[0];
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1657 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1658 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1659 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1661
1303 my $pl = load_pl path $login 1662 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1663 or return;
1664
1665 my $pl = cf::player::load_pl $f
1666 or return;
1667
1668 local $cf::PLAYER_LOADING{$login} = $pl;
1669 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1306 } 1671 }
1307 } 1672 }
1308} 1673}
1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1309 1687
1310sub save($) { 1688sub save($) {
1311 my ($pl) = @_; 1689 my ($pl) = @_;
1312 1690
1313 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1318 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1319 1697
1320 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1322 1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1705
1323 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1324 Coro::cede; 1707 cf::cede_to_tick;
1325} 1708}
1326 1709
1327sub new($) { 1710sub new($) {
1328 my ($login) = @_; 1711 my ($login) = @_;
1329 1712
1358 my ($pl) = @_; 1741 my ($pl) = @_;
1359 1742
1360 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1361 1744
1362 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1364 1747
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1366 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1368 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1369 1756
1370 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1372 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1407 or return []; 1794 or return [];
1408 1795
1409 my @logins; 1796 my @logins;
1410 1797
1411 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1799 my $path = path $login;
1800
1801 # a .pst is a dead give-away for a valid player
1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1807 }
1415 1808
1416 utf8::decode $login; 1809 utf8::decode $login;
1417 push @logins, $login; 1810 push @logins, $login;
1418 } 1811 }
1419 1812
1420 \@logins 1813 \@logins
1421} 1814}
1422 1815
1423=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1424 1819
1425Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1426player. May block. 1821player. May block.
1427 1822
1428=cut 1823=cut
1446 } 1841 }
1447 1842
1448 \@paths 1843 \@paths
1449} 1844}
1450 1845
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1847
1453Expand crossfire pod fragments into protocol xml. 1848Expand 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 1849
1501=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1502 1851
1503Sends an ext reply to the player. 1852Sends an ext reply to the player.
1504 1853
1505=cut 1854=cut
1506 1855
1507sub ext_reply($$@) { 1856sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1857 my ($self, $id, @msg) = @_;
1509 1858
1510 if ($self->ns->extcmd == 2) { 1859 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1860}
1518 1861
1519=item $player->ext_msg ($type, @msg) 1862=item $player->ext_msg ($type, @msg)
1520 1863
1521Sends an ext event to the client. 1864Sends an ext event to the client.
1542 1885
1543=cut 1886=cut
1544 1887
1545sub find_by_path($) { 1888sub find_by_path($) {
1546 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1547 1892
1548 my ($match, $specificity); 1893 my ($match, $specificity);
1549 1894
1550 for my $region (list) { 1895 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1577our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1579 1924
1580sub generate_random_map { 1925sub generate_random_map {
1581 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1582 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1583 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1591 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1592 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1595 )
1596} 1931}
1597 1932
1598=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1599 1934
1600Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1605 1940
1606sub register { 1941sub register {
1607 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1608 my $pkg = caller; 1943 my $pkg = caller;
1609 1944
1610 no strict;
1611 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1612 1946
1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1614} 1948}
1615 1949
1616# also paths starting with '/' 1950# also paths starting with '/'
1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1618 1952
1619sub thawer_merge { 1953sub thawer_merge {
1620 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1621 1955
1622 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1627} 1961}
1628 1962
1629sub normalise { 1963sub normalise {
1630 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1631 1965
1632 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1633 1967
1634 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1635 1969
1636 # map plan: 1970 # map plan:
1637 # 1971 #
1652 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1653 $path = "$base/$path"; 1987 $path = "$base/$path";
1654 } 1988 }
1655 1989
1656 for ($path) { 1990 for ($path) {
1657 redo if s{//}{/};
1658 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1659 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1660 } 1993 }
1661 1994
1662 $path 1995 $path
1676 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1677 return $self; 2010 return $self;
1678 } 2011 }
1679 } 2012 }
1680 2013
1681 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1682 () 2015 ()
1683} 2016}
1684 2017
2018# may re-bless or do other evil things
1685sub init { 2019sub init {
1686 my ($self) = @_; 2020 my ($self) = @_;
1687 2021
1688 $self 2022 $self
1689} 2023}
1708 2042
1709# the temporary/swap location 2043# the temporary/swap location
1710sub save_path { 2044sub save_path {
1711 my ($self) = @_; 2045 my ($self) = @_;
1712 2046
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1715} 2049}
1716 2050
1717# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1718sub uniq_path { 2052sub uniq_path {
1719 my ($self) = @_; 2053 my ($self) = @_;
1720 2054
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 2057}
1733 2058
1734sub decay_objects { 2059sub decay_objects {
1735 my ($self) = @_; 2060 my ($self) = @_;
1736 2061
1749 2074
1750sub load_header_from($) { 2075sub load_header_from($) {
1751 my ($self, $path) = @_; 2076 my ($self, $path) = @_;
1752 2077
1753 utf8::encode $path; 2078 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 2079 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 2080 or return;
1759 2081
2082 $self->_load_header ($f)
2083 or return;
2084
2085 local $MAP_LOADING{$self->{path}} = $self;
2086 $f->resolve_delayed_derefs;
2087
1760 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1761 2089
1762 1 2090 1
1763} 2091}
1764 2092
2093# used to laod the header of an original map
1765sub load_header_orig { 2094sub load_header_orig {
1766 my ($self) = @_; 2095 my ($self) = @_;
1767 2096
1768 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1769} 2098}
1770 2099
2100# used to laod the header of an instantiated map
1771sub load_header_temp { 2101sub load_header_temp {
1772 my ($self) = @_; 2102 my ($self) = @_;
1773 2103
1774 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1775} 2105}
1776 2106
2107# called after loading the header from an instantiated map
1777sub prepare_temp { 2108sub prepare_temp {
1778 my ($self) = @_; 2109 my ($self) = @_;
1779 2110
1780 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1781 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1782 # safety 2113 # safety
1783 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1784 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1785} 2116}
1786 2117
2118# called after loading the header from an original map
1787sub prepare_orig { 2119sub prepare_orig {
1788 my ($self) = @_; 2120 my ($self) = @_;
1789 2121
1790 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1791 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1815 2147
1816sub find; 2148sub find;
1817sub find { 2149sub find {
1818 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1819 2151
2152 cf::cede_to_tick;
2153
1820 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1821 2155
2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2158
1824 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1827 or return; 2161 or return;
1828 2162
1829 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1830 2164
1832 or return; 2166 or return;
1833 2167
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2172 undef $guard1;
1837 $map->reset; 2173 $map->reset;
1838 undef $guard;
1839 return find $path; 2174 return find $path;
1840 } 2175 }
1841 2176
1842 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1843 } 2178 }
1844} 2179}
1845 2180
1846sub pre_load { } 2181sub pre_load { }
1847sub post_load { } 2182#sub post_load { } # XS
1848 2183
1849sub load { 2184sub load {
1850 my ($self) = @_; 2185 my ($self) = @_;
1851 2186
1852 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1853 2188
1854 my $path = $self->{path}; 2189 my $path = $self->{path};
1855 2190
1856 { 2191 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1858 2193
2194 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1860
1861 $self->in_memory (cf::MAP_LOADING);
1862 2196
1863 $self->alloc; 2197 $self->alloc;
1864 2198
1865 $self->pre_load; 2199 $self->pre_load;
1866 Coro::cede; 2200 cf::cede_to_tick;
1867 2201
1868 $self->_load_objects ($self->{load_path}, 1) 2202 if (exists $self->{load_path}) {
2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2204 $f->skip_block;
2205 $self->_load_objects ($f)
1869 or return; 2206 or return;
1870 2207
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1872 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1873 2210
1874 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2212 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2213 unless (aio_stat $uniq) {
2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2215 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2216 $self->_load_objects ($f);
2217 $f->resolve_delayed_derefs;
2218 }
2219 }
1879 } 2220 }
1880 }
1881 2221
1882 Coro::cede; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2229
2230 cf::cede_to_tick;
1883 # now do the right thing for maps 2231 # now do the right thing for maps
1884 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2234 unless $self->difficulty;
1887 Coro::cede; 2235 cf::cede_to_tick;
1888 2236
1889 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2238 $self->decay_objects;
1891 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1892 $self->update_buttons; 2240 $self->update_buttons;
1893 Coro::cede; 2241 cf::cede_to_tick;
1894 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1895 Coro::cede;
1896 $self->activate;
1897 } 2243 }
1898 2244
1899 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
1901
1902 $self->in_memory (cf::MAP_IN_MEMORY);
1903 } 2247 }
1904 2248
1905 $self->post_load; 2249 $self->post_load;
1906}
1907 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
1908sub customise_for { 2257sub customise_for {
1909 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1910 2259
1911 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1912 if $self->per_player; 2261 if $self->per_player;
1915# if $self->per_party; 2264# if $self->per_party;
1916 2265
1917 $self 2266 $self
1918} 2267}
1919 2268
1920# find and load all maps in the 3x3 area around a map
1921sub load_diag {
1922 my ($map) = @_;
1923
1924 my @diag; # diagonal neighbours
1925
1926 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_)
1928 or next;
1929 $neigh = find $neigh, $map
1930 or next;
1931 $neigh->load;
1932
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 }
1936
1937 for (@diag) {
1938 my $neigh = find @$_
1939 or next;
1940 $neigh->load;
1941 }
1942}
1943
1944sub find_sync { 2269sub find_sync {
1945 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
1946 2271
1947 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
1948} 2277}
1949 2278
1950sub do_load_sync { 2279sub do_load_sync {
1951 my ($map) = @_; 2280 my ($map) = @_;
1952 2281
1953 cf::sync_job { $map->load }; 2282 # it's a bug to call this from the main context
2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2284 if $Coro::current == $Coro::main;
2285
2286 $map->load;
1954} 2287}
1955 2288
1956our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
1958 2291
1959sub find_async { 2292sub find_async {
1960 my ($path, $origin) = @_; 2293 my ($path, $origin, $load) = @_;
1961 2294
1962 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
1963 2296
1964 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
1966 } 2299 }
1967 2300
1968 undef $MAP_PREFETCH{$path}; 2301 $MAP_PREFETCH{$path} |= $load;
2302
1969 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
1970 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2308 if (my $map = find $k) {
1973 $map->load; 2309 $map->load if $v;
1974 } 2310 }
1975 2311
1976 delete $MAP_PREFETCH{$path}; 2312 delete $MAP_PREFETCH{$k};
1977 } 2313 }
1978 } 2314 }
1979 undef $MAP_PREFETCHER; 2315 undef $MAP_PREFETCHER;
1980 }; 2316 };
1981 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
1982 2318
1983 () 2319 ()
1984} 2320}
1985 2321
2322# common code, used by both ->save and ->swapout
1986sub save { 2323sub _save {
1987 my ($self) = @_; 2324 my ($self) = @_;
1988
1989 my $lock = cf::lock_acquire "map_data:" . $self->path;
1990 2325
1991 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
1992 2327
1993 return unless $self->dirty; 2328 return unless $self->dirty;
1994 2329
2000 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2001 2336
2002 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
2003 2338
2004 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2006 }; 2342 };
2343
2344 cf::get_slot 0.02;
2007 2345
2008 if ($uniq) { 2346 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2349 } else {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2013 } 2351 }
2014} 2352}
2015 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2016sub swap_out { 2362sub swap_out {
2017 my ($self) = @_; 2363 my ($self) = @_;
2018 2364
2019 # save first because save cedes
2020 $self->save;
2021
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2024 return if $self->players; 2369 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save};
2027 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2028 $self->clear; 2380 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2381}
2031 2382
2032sub reset_at { 2383sub reset_at {
2033 my ($self) = @_; 2384 my ($self) = @_;
2034 2385
2052 2403
2053 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2054 2405
2055 return if $self->players; 2406 return if $self->players;
2056 2407
2057 warn "resetting map ", $self->path; 2408 cf::trace "resetting map ", $self->path, "\n";
2058 2409
2059 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2060 2411
2061 # need to save uniques path 2412 # need to save uniques path
2062 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2063 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2064 2415
2066 if $uniq; 2417 if $uniq;
2067 } 2418 }
2068 2419
2069 delete $cf::MAP{$self->path}; 2420 delete $cf::MAP{$self->path};
2070 2421
2422 $self->deactivate;
2423 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2424 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2425
2075 $self->unlink_save; 2426 $self->unlink_save;
2076 $self->destroy; 2427 $self->destroy;
2077} 2428}
2078 2429
2079my $nuke_counter = "aaaa"; 2430my $nuke_counter = "aaaa";
2080 2431
2081sub nuke { 2432sub nuke {
2082 my ($self) = @_; 2433 my ($self) = @_;
2083 2434
2435 {
2436 my $lock = cf::lock_acquire "map_data:$self->{path}";
2437
2084 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2085 2439
2086 $self->unlink_save; 2440 $self->unlink_save;
2087 2441
2088 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2089 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2447
2094 $cf::MAP{$self->path} = $self; 2448 $cf::MAP{$self->path} = $self;
2449 }
2095 2450
2096 $self->reset; # polite request, might not happen 2451 $self->reset; # polite request, might not happen
2097} 2452}
2098 2453
2099=item $maps = cf::map::tmp_maps 2454=item $maps = cf::map::tmp_maps
2141 2496
2142sub unique_maps() { 2497sub unique_maps() {
2143 [ 2498 [
2144 map { 2499 map {
2145 utf8::decode $_; 2500 utf8::decode $_;
2146 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2147 ? normalise $_ 2504 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2506 ]
2151} 2507}
2152 2508
2153package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2154 2540
2155=back 2541=back
2156 2542
2157=head3 cf::object 2543=head3 cf::object
2158 2544
2162 2548
2163=over 4 2549=over 4
2164 2550
2165=item $ob->inv_recursive 2551=item $ob->inv_recursive
2166 2552
2167Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2168 2555
2169=cut 2556=cut
2170 2557
2171sub inv_recursive_; 2558sub inv_recursive_;
2172sub inv_recursive_ { 2559sub inv_recursive_ {
2175 2562
2176sub inv_recursive { 2563sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2178} 2565}
2179 2566
2567=item $ref = $ob->ref
2568
2569Creates and returns a persistent reference to an object that can be stored as a string.
2570
2571=item $ob = cf::object::deref ($refstring)
2572
2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2574even if the object actually exists. May block.
2575
2576=cut
2577
2578sub deref {
2579 my ($ref) = @_;
2580
2581 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2582 my ($uuid, $name) = ($1, $2);
2583 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2584 or return;
2585 $pl->ob->uuid eq $uuid
2586 or return;
2587
2588 $pl->ob
2589 } else {
2590 warn "$ref: cannot resolve object reference\n";
2591 undef
2592 }
2593}
2594
2180package cf; 2595package cf;
2181 2596
2182=back 2597=back
2183 2598
2184=head3 cf::object::player 2599=head3 cf::object::player
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2605Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2192dialogue with the given NPC character. 2607dialogue with the given NPC character.
2193 2608
2194=cut 2609=cut
2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2195 2624
2196# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2626# with dialog boxes.
2198#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2199sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213 2642
2214 } else { 2643 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2646 }
2218 } 2647 }
2219} 2648}
2220 2649
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2246 2675
2247=item $player_object->enter_link 2676=item $player_object->enter_link
2248 2677
2249Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2250 2679
2251The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2252I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2253 2684
2254Will never block. 2685Will never block.
2255 2686
2256=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2257 2688
2277sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2278 my ($self) = @_; 2709 my ($self) = @_;
2279 2710
2280 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2281 2712
2713 ++$self->{_link_recursion};
2714
2282 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2283 2716
2284 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2285 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2286 2719
2287 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2288} 2721}
2289 2722
2290sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2291 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2292 2725
2309 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2310 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2311 2744
2312 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2315 2748
2316 $map->load; 2749 $map->load;
2317 $map->load_diag;
2318 2750
2319 return unless $self->contr->active; 2751 return unless $self->contr->active;
2320 $self->activate_recursive;
2321 2752
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2323 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2324} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2325 2760
2761}
2762
2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2327 2764
2328Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2329her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2330that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2331the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process. 2769be called at the end of this process.
2333 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2334=cut 2774=cut
2335 2775
2336our $GOTOGEN; 2776our $GOTOGEN;
2337 2777
2338sub cf::object::player::goto { 2778sub cf::object::player::goto {
2339 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2340 2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2786
2341 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2789
2344 $self->enter_link; 2790 $self->enter_link;
2345 2791
2346 (async { 2792 (async {
2793 $Coro::current->{desc} = "player::goto $path $x $y";
2794
2795 # *tag paths override both path and x|y
2796 if ($path =~ /^\*(.*)$/) {
2797 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2798 my $ob = $obs[rand @obs];
2799
2800 # see if we actually can go there
2801 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2802 $ob = $obs[rand @obs];
2803 } else {
2804 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2805 }
2806 # else put us there anyways for now #d#
2807
2808 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2809 } else {
2810 ($path, $x, $y) = (undef, undef, undef);
2811 }
2812 }
2813
2347 my $map = eval { 2814 my $map = eval {
2348 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2349 2816
2350 if ($map) { 2817 if ($map) {
2351 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2353 } else { 2820 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2822 }
2356 2823
2357 $map 2824 $map
2358 }; 2825 };
2359 2826
2365 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2366 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2367 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2368 } 2835 }
2369 2836
2370 $done->() if $done; 2837 $done->($self) if $done;
2371 })->prio (1); 2838 })->prio (1);
2372} 2839}
2373 2840
2374=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2375 2842
2395} 2862}
2396 2863
2397sub prepare_random_map { 2864sub prepare_random_map {
2398 my ($exit) = @_; 2865 my ($exit) = @_;
2399 2866
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2869 # that depends on the exit object
2405 2870
2406 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2873 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2413 } 2880 }
2414 2881
2415 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2416 2883
2417 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2420 2887
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2890 undef $fh;
2424 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2425 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2428 } 2899 }
2429} 2900}
2430 2901
2431sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2433 2904
2434 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2435 2906
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2907 $self->enter_link;
2448 2908
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2909 (async {
2454 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2455 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2456 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2457 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2458 1; 2948 1
2459 }) { 2949 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2461 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2462 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2464 2954
2465 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2466 $self->leave_link; 2956 $self->leave_link;
2467 } 2957 }
2468 })->prio (1); 2958 })->prio (1);
2469} 2959}
2470 2960
2482sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2483 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2484 2974
2485 utf8::encode $text; 2975 utf8::encode $text;
2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2487} 3002}
2488 3003
2489=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2490 3005
2491Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2493the message, with C<log> being the default. If C<$color> is negative, suppress 3008the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2495 3010
2496=cut 3011=cut
2497 3012
3013# non-persistent channels (usually the info channel)
3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
3021 "c/identify" => {
3022 id => "infobox",
3023 title => "Identify",
3024 reply => undef,
3025 tooltip => "Items recently identified",
3026 },
3027 "c/examine" => {
3028 id => "infobox",
3029 title => "Examine",
3030 reply => undef,
3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
3038 },
3039 "c/book" => {
3040 id => "infobox",
3041 title => "Book",
3042 reply => undef,
3043 tooltip => "The contents of a note or book",
3044 },
3045 "c/lookat" => {
3046 id => "infobox",
3047 title => "Look",
3048 reply => undef,
3049 tooltip => "What you saw there",
3050 },
3051 "c/who" => {
3052 id => "infobox",
3053 title => "Players",
3054 reply => undef,
3055 tooltip => "Shows players who are currently online",
3056 },
3057 "c/body" => {
3058 id => "infobox",
3059 title => "Body Parts",
3060 reply => undef,
3061 tooltip => "Shows which body parts you posess and are available",
3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
3099 "c/uptime" => {
3100 id => "infobox",
3101 title => "Uptime",
3102 reply => undef,
3103 tooltip => "How long the server has been running since last restart",
3104 },
3105 "c/mapinfo" => {
3106 id => "infobox",
3107 title => "Map Info",
3108 reply => undef,
3109 tooltip => "Information related to the maps",
3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
3125);
3126
2498sub cf::client::send_msg { 3127sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2500 3129
2501 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2502 3132
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 3134
3135 # check predefined channels, for the benefit of C
3136 if ($CHANNEL{$channel}) {
3137 $channel = $CHANNEL{$channel};
3138
3139 $self->ext_msg (channel_info => $channel);
3140 $channel = $channel->{id};
3141
2505 if (ref $channel) { 3142 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 3146 $self->ext_msg (channel_info => $channel);
2510 } 3147 }
2512 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2513 } 3150 }
2514 3151
2515 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2516 3153
2517 if ($self->can_msg) {
2518 # default colour, mask it out 3154 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2521 3157
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2524 } else { 3161 );
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535 3162
2536 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2537
2538 utf8::encode $msg;
2539
2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 }
2549} 3164}
2550 3165
2551=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2552 3167
2553Sends an ext event to the client. 3168Sends an ext event to the client.
2555=cut 3170=cut
2556 3171
2557sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2559 3174
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 3175 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 3180 }
3181}
3182
3183=item $client->ext_reply ($msgid, @msg)
3184
3185Sends an ext reply to the client.
3186
3187=cut
3188
3189sub cf::client::ext_reply($$@) {
3190 my ($self, $id, @msg) = @_;
3191
3192 return unless $self->extcmd == 2;
3193
3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2568} 3195}
2569 3196
2570=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2571 3198
2572Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2627 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2628 3255
2629 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2630 3257
2631 if (ref $msg) { 3258 if (ref $msg) {
2632 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2633 "ARRAY" eq ref $msg 3260
2634 ? @$msg 3261 my @reply;
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 3262
2637 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 3265 }
3266
3267 $ns->ext_reply ($reply, @reply)
3268 if $reply;
3269
2643 } else { 3270 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 3272 }
2646 3273
2647 cf::override; 3274 cf::override;
2648 }, 3275 },
2649); 3276);
2669 3296
2670 $coro 3297 $coro
2671} 3298}
2672 3299
2673cf::client->attach ( 3300cf::client->attach (
2674 on_destroy => sub { 3301 on_client_destroy => sub {
2675 my ($ns) = @_; 3302 my ($ns) = @_;
2676 3303
2677 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2678 }, 3305 },
2679); 3306);
2695our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2696 3323
2697$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2698 3325
2699$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
2701 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
2702 sort time 3329 sort time
2703)); 3330));
2704 3331
2705# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2707=pod 3334=pod
2708 3335
2709The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2710 3337
2711 cf::object 3338 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3339 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3340 insert remove name archname title slaying race decrease split
3341 value
2714 3342
2715 cf::object::player 3343 cf::object::player
2716 player 3344 player
2717 3345
2718 cf::player 3346 cf::player
2723 3351
2724=cut 3352=cut
2725 3353
2726for ( 3354for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3356 insert remove inv nrof name archname title slaying race
3357 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2732) { 3361) {
2733 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2736 for @funs; 3364 for @funs;
2737} 3365}
2738 3366
2753 3381
2754 my $qcode = $code; 3382 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2757 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2758 local $_; 3389 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars;
2760 3390
2761 my $eval = 3391 my $eval =
2762 "do {\n" 3392 "do {\n"
2763 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2764 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2765 . $code 3395 . $code
2766 . "\n}" 3396 . "\n}"
2767 ; 3397 ;
2768 3398
3399 if ($CFG{safe_eval}) {
2769 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2770 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2771 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
2772 3408
2773 if ($@) { 3409 if ($@) {
2774 warn "$@"; 3410 warn "$@",
2775 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2776 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2777 } 3413 }
2778 3414
2779 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2780} 3416}
2781 3417
2795=cut 3431=cut
2796 3432
2797sub register_script_function { 3433sub register_script_function {
2798 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2799 3435
2800 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2801 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2802} 3438}
2803 3439
2804=back 3440=back
2805 3441
2806=cut 3442=cut
2809# the server's init and main functions 3445# the server's init and main functions
2810 3446
2811sub load_facedata($) { 3447sub load_facedata($) {
2812 my ($path) = @_; 3448 my ($path) = @_;
2813 3449
3450 # HACK to clear player env face cache, we need some signal framework
3451 # for this (global event?)
3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3453
3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3455
2814 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2815 3457
2816 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2817 0 < aio_load $path, $facedata
2818 or die "$path: $!";
2819
2820 $facedata = Coro::Storable::thaw $facedata;
2821 3459
2822 $facedata->{version} == 2 3460 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3462
3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3465 $facedata->{resource}{"res/exp_table"} = {
3466 type => FT_RSRC,
3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3469 };
3470 cf::cede_to_tick;
3471
2825 { 3472 {
2826 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2827 3474
2828 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2830 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2834 3483
2835 cf::cede_to_tick; 3484 cf::cede_to_tick;
2836 } 3485 }
2837 3486
2838 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2840 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2841 or next; 3491 or next;
3492
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3496 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
2847 } 3498 }
2848 3499
2849 cf::cede_to_tick; 3500 cf::cede_to_tick;
2850 } 3501 }
2851 } 3502 }
2860 3511
2861 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
2862 } 3513 }
2863 3514
2864 { 3515 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3517
2872 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3519 if (defined (my $type = $info->{type})) {
2874 name => $name, 3520 # TODO: different hash - must free and use new index, or cache ixface data queue
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879 3522
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
2887 } else { 3526 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3527# $RESOURCE{$name} = $info; # unused
2889 } 3528 }
2890 3529
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3530 cf::cede_to_tick;
2894 } 3531 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3532 }
3533
3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3535
2915 1 3536 1
2916} 3537}
2917 3538
2918register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
2921 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3543 $ns->fx_want ($k, $v);
2923 } 3544 }
2924}; 3545};
2925 3546
3547sub load_resource_file($) {
3548 my $guard = lock_acquire "load_resource_file";
3549
3550 my $status = load_resource_file_ $_[0];
3551 get_slot 0.1, 100;
3552 cf::arch::commit_load;
3553
3554 $status
3555}
3556
2926sub reload_regions { 3557sub reload_regions {
3558 # HACK to clear player env face cache, we need some signal framework
3559 # for this (global event?)
3560 %ext::player_env::MUSIC_FACE_CACHE = ();
3561
2927 load_resource_file "$MAPDIR/regions" 3562 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3563 or die "unable to load regions file\n";
2929 3564
2930 for (cf::region::list) { 3565 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3566 $_->{match} = qr/$_->{match}/
2939} 3574}
2940 3575
2941sub reload_archetypes { 3576sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3577 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3578 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3579}
2950 3580
2951sub reload_treasures { 3581sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
2954} 3584}
2955 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
2956sub reload_resources { 3606sub reload_resources {
2957 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
2958 3608
3609 reload_exp_table;
3610 reload_materials;
3611 reload_facedata;
3612 reload_sound;
3613 reload_archetypes;
2959 reload_regions; 3614 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3615 reload_treasures;
2964 3616
2965 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
2966} 3618}
2967 3619
2968sub init { 3620sub reload_config {
2969 reload_resources; 3621 trace "reloading config file...\n";
2970}
2971 3622
2972sub cfg_load { 3623 my $config = load_file "$CONFDIR/config";
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3624 utf8::decode $config;
2974 or return; 3625 *CFG = decode_yaml $config;
2975 3626
2976 local $/;
2977 *CFG = YAML::Syck::Load <$fh>;
2978
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2980 3628
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2983 3631
2984 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
2988 }; 3636 };
2989 warn $@ if $@; 3637 warn $@ if $@;
2990 } 3638 }
2991} 3639}
2992 3640
3641sub pidfile() {
3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3643 or die "$PIDFILE: $!";
3644 flock $fh, &Fcntl::LOCK_EX
3645 or die "$PIDFILE: flock: $!";
3646 $fh
3647}
3648
3649# make sure only one server instance is running at any one time
3650sub atomic {
3651 my $fh = pidfile;
3652
3653 my $pid = <$fh>;
3654 kill 9, $pid if $pid > 0;
3655
3656 seek $fh, 0, 0;
3657 print $fh $$;
3658}
3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
2993sub main { 3669sub main {
3670 cf::init_globals; # initialise logging
3671
3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676
3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678
2994 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3681 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3682 (async {
2998 Event::one_event; 3683 $Coro::current->{desc} = "IDLE BUG HANDLER";
3684 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3685 })->prio (Coro::PRIO_MAX);
3000 }; 3686 };
3001 3687
3002 cfg_load; 3688 evthread_start IO::AIO::poll_fileno;
3689
3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3699 reload_resources;
3700 reload_config;
3003 db_init; 3701 db_init;
3702
3703 cf::init_uuid;
3704 cf::init_signals;
3705 cf::init_skills;
3706
3707 cf::init_beforeplay;
3708
3709 atomic;
3710
3004 load_extensions; 3711 load_extensions;
3005 3712
3006 $TICK_WATCHER->start; 3713 utime time, time, $RUNTIMEFILE;
3007 Event::loop; 3714
3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3718
3719 cf::_post_init 0;
3720 };
3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
3008} 3730}
3009 3731
3010############################################################################# 3732#############################################################################
3011# initialisation and cleanup 3733# initialisation and cleanup
3012 3734
3013# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3014BEGIN { 3736BEGIN {
3737 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3023 },
3024 ); 3741 };
3025 } 3742 }
3026} 3743}
3027 3744
3028sub write_runtime { 3745sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime"; 3746 my $t0 = AE::time;
3030 3747
3031 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3033 3750
3034 IO::AIO::aio_utime $runtime, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3035 3752
3036 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3037 3754
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3039 or return; 3756 or return;
3040 3757
3041 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3053 aio_utime $fh, undef, undef; 3770 aio_utime $fh, undef, undef;
3054 3771
3055 close $fh 3772 close $fh
3056 or return; 3773 or return;
3057 3774
3058 aio_rename "$runtime~", $runtime 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3059 and return; 3776 and return;
3060 3777
3061 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3062 3779
3063 1 3780 1
3781}
3782
3783our $uuid_lock;
3784our $uuid_skip;
3785
3786sub write_uuid_sync($) {
3787 $uuid_skip ||= $_[0];
3788
3789 return if $uuid_lock;
3790 local $uuid_lock = 1;
3791
3792 my $uuid = "$LOCALDIR/uuid";
3793
3794 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3795 or return;
3796
3797 my $value = uuid_seq uuid_cur;
3798
3799 unless ($value) {
3800 info "cowardly refusing to write zero uuid value!\n";
3801 return;
3802 }
3803
3804 my $value = uuid_str $value + $uuid_skip;
3805 $uuid_skip = 0;
3806
3807 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3808 and return;
3809
3810 # always fsync - this file is important
3811 aio_fsync $fh
3812 and return;
3813
3814 close $fh
3815 or return;
3816
3817 aio_rename "$uuid~", $uuid
3818 and return;
3819
3820 trace "uuid file written ($value).\n";
3821
3822 1
3823
3824}
3825
3826sub write_uuid($$) {
3827 my ($skip, $sync) = @_;
3828
3829 $sync ? write_uuid_sync $skip
3830 : async { write_uuid_sync $skip };
3064} 3831}
3065 3832
3066sub emergency_save() { 3833sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3068 3835
3069 warn "enter emergency perl save\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3070 3842
3071 cf::sync_job { 3843 cf::sync_job {
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3072 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3073 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3074 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3076 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3852 $pl->valid or next;
3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3854 $pl->save;
3080 } 3855 }
3081 warn "end emergency player save\n"; 3856 info "emergency_perl_save: end player save\n";
3082 3857
3083 warn "begin emergency map save\n"; 3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3860 info "emergency_perl_save: begin map save\n";
3084 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3085 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3086 $map->valid or next; 3863 $map->valid or next;
3087 $map->save; 3864 $map->save;
3088 } 3865 }
3089 warn "end emergency map save\n"; 3866 info "emergency_perl_save: end map save\n";
3090 3867
3091 warn "begin emergency database checkpoint\n"; 3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3870 info "emergency_perl_save: begin database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3873
3874 info "emergency_perl_save: begin write uuid\n";
3875 write_uuid_sync 1;
3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3094 }; 3896 };
3095 3897
3096 warn "leave emergency perl save\n"; 3898 info "emergency_perl_save: leave\n";
3097} 3899}
3098 3900
3099sub post_cleanup { 3901sub post_cleanup {
3100 my ($make_core) = @_; 3902 my ($make_core) = @_;
3101 3903
3904 IO::AIO::flush;
3905
3102 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3103 if $make_core; 3907 if $make_core;
3908
3909 my $fh = pidfile;
3910 unlink $PIDFILE if <$fh> == $$;
3911}
3912
3913# a safer delete_package, copied from Symbol
3914sub clear_package($) {
3915 my $pkg = shift;
3916
3917 # expand to full symbol table name if needed
3918 unless ($pkg =~ /^main::.*::$/) {
3919 $pkg = "main$pkg" if $pkg =~ /^::/;
3920 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3921 $pkg .= '::' unless $pkg =~ /::$/;
3922 }
3923
3924 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3925 my $stem_symtab = *{$stem}{HASH};
3926
3927 defined $stem_symtab and exists $stem_symtab->{$leaf}
3928 or return;
3929
3930 # clear all symbols
3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3932 for my $name (keys %$leaf_symtab) {
3933 _gv_clear *{"$pkg$name"};
3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3935 }
3104} 3936}
3105 3937
3106sub do_reload_perl() { 3938sub do_reload_perl() {
3107 # can/must only be called in main 3939 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3109 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3110 return; 3942 return;
3111 } 3943 }
3112 3944
3113 warn "reloading..."; 3945 return if $RELOAD++;
3114 3946
3115 warn "entering sync_job"; 3947 my $t1 = AE::time;
3116 3948
3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3952
3953 trace "perl_reload: entering sync_job";
3954
3117 cf::sync_job { 3955 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark
3119 cf::emergency_save; 3956 #cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark
3121 3957
3122 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV;
3124
3125 # if anything goes wrong in here, we should simply crash as we already saved
3126
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate...";
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = (); 3960 %EXT_CORO = ();
3146 3961
3147 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3148 %COMMAND = (); 3963 %COMMAND = ();
3149 3964
3150 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3151 %EXTCMD = (); 3966 %EXTCMD = ();
3152 %EXTICMD = (); 3967 %EXTICMD = ();
3153 3968
3154 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3155 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3157 3972
3158 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3159 eval { 3974 eval {
3160 $cb->($pkg); 3975 $cb->($pkg);
3161 1 3976 1
3162 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3978 }
3979
3980 trace "... clearing $pkg";
3981 clear_package $pkg;
3163 } 3982 }
3164 3983
3165 warn "... nuking $pkg";
3166 Symbol::delete_package $pkg;
3167 }
3168
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3170 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3987
3173 warn "... unloading $k"; 3988 trace "... unloading $k";
3174 delete $INC{$k}; 3989 delete $INC{$k};
3175 3990
3176 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3178 3993
3179 if (my $cb = $k->can ("unload_module")) { 3994 if (my $cb = $k->can ("unload_module")) {
3180 $cb->(); 3995 $cb->();
3996 }
3997
3998 clear_package $k;
3181 } 3999 }
3182 4000
3183 Symbol::delete_package $k;
3184 }
3185
3186 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 4002 clear_package "safe::$_"
3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3189 4004
3190 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3193 4008
3194 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3195 # and global variables created in xs 4010 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3197 4012
3198 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3199 4014
3200 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3201 require cf; 4016 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3203 4018
3204 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3205 cf::cfg_load; 4020 cf::reload_config;
3206 4021
3207 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3208 cf::load_extensions; 4023 cf::load_extensions;
3209 4024
4025 if ($REATTACH_ON_RELOAD) {
3210 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3213 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
4032 }
3216 4033
3217 warn "leaving sync_job"; 4034 cf::_post_init 1;
3218 4035
4036 trace "perl_reload: leaving sync_job";
4037
3219 1 4038 1
3220 } or do { 4039 } or do {
3221 warn $@; 4040 error $@;
3222 warn "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3223 exit 1; 4042 };
4043
4044 --$RELOAD;
3224 }; 4045 }
3225 4046
3226 warn "reloaded"; 4047 $t1 = AE::time - $t1;
4048 info "perl_reload: completed in ${t1}s\n";
3227}; 4049};
3228 4050
3229our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3230 4052
3231sub reload_perl() { 4053sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 4054 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3234 4056
3235 $RELOAD_WATCHER ||= Event->timer ( 4057 $RELOAD_WATCHER ||= cf::async {
3236 reentrant => 0, 4058 Coro::AIO::aio_wait cache_extensions;
3237 after => 0, 4059
3238 data => WF_AUTOCANCEL, 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3239 cb => sub {
3240 do_reload_perl; 4061 do_reload_perl;
3241 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3242 }, 4063 };
3243 ); 4064 };
3244} 4065}
3245 4066
3246register_command "reload" => sub { 4067register_command "reload" => sub {
3247 my ($who, $arg) = @_; 4068 my ($who, $arg) = @_;
3248 4069
3249 if ($who->flag (FLAG_WIZ)) { 4070 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 4071 $who->message ("reloading server.");
4072 async {
4073 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 4074 reload_perl;
4075 };
3252 } 4076 }
3253}; 4077};
3254 4078
3255unshift @INC, $LIBDIR; 4079#############################################################################
3256 4080
3257my $bug_warning = 0; 4081my $bug_warning = 0;
3258 4082
3259our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN;
3261
3262sub wait_for_tick { 4083sub wait_for_tick() {
3263 return unless $TICK_WATCHER->is_active; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3264 return if $Coro::current == $Coro::main;
3265 4085
3266 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3267 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait;
3269} 4087}
3270 4088
3271sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3272 return unless $TICK_WATCHER->is_active; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3273 return if $Coro::current == $Coro::main;
3274 4091
3275 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 4094 $signal->wait;
3278} 4095}
3279 4096
3280 my $min = 1e6;#d# 4097sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 4098 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3292 return; 4101 return;
3293 } 4102 }
3294 4103
3295 $NOW = $tick_start = Event::time; 4104 cf::one_tick; # one server iteration
3296 4105
3297 cf::server_tick; # one server iteration 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3298 4107
3299 0 && sync_job {#d# 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 4110 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4111 $Coro::current->{desc} = "runtime saver";
3303 or die; 4112 write_runtime_sync
3304 4113 or error "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 4114 };
4115 }
3321 4116
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 4118 $sig->send;
3338 } 4119 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3340 $sig->send;
3341 }
3342 4121
3343 $NOW = Event::time; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 4124
3354 _post_tick; 4125 if (0) {
3355 4126 if ($NEXT_TICK) {
3356 4127 my $jitter = $TICK_START - $NEXT_TICK;
4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4129 debug "jitter $JITTER\n";#d#
4130 }
3357 }, 4131 }
3358); 4132}
3359 4133
3360{ 4134{
3361 BDB::max_poll_time $TICK * 0.1; 4135 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 4136
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3371 4138 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 4140
3387 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 4148
3390 cf::sync_job { 4149 cf::sync_job {
3391 eval { 4150 eval {
3392 BDB::db_env_open 4151 BDB::db_env_open
3393 $DB_ENV, 4152 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4154 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4155 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 4156 0666;
3398 4157
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4158 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 4159 };
3404 4160
3405 cf::cleanup "db_env_open(db): $@" if $@; 4161 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 4162 };
3407 } 4163 }
4164
4165 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4166 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4167 };
4168 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 };
3408} 4174}
3409 4175
3410{ 4176{
4177 # configure IO::AIO
4178
3411 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 4181 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 4182}
3424 4183
3425my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3426 4186
3427sub _log_backtrace { 4187sub _log_backtrace {
3428 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3429 4189
3430 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3431 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3432 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3434 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3435 async { 4200 async {
4201 $Coro::current->{desc} = "abt $msg";
4202
3436 my @bt = fork_call { 4203 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 4207 or die "addr2line: $!";
3448 } 4215 }
3449 4216
3450 @funcs 4217 @funcs
3451 }; 4218 };
3452 4219
3453 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace; 4223 --$_log_backtrace;
3456 }; 4224 };
3457 } else { 4225 } else {
3458 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3459 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3460 } 4228 }
3461} 4229}
3462 4230
3463# load additional modules 4231# load additional modules
3464use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3465 4234
3466END { cf::emergency_save } 4235END { cf::emergency_save }
3467 4236
34681 42371
3469 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines