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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines