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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines