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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines