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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines