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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines