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.425 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.617 by root, Mon Aug 10 18:46:04 2015 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
602 Coro::cede;
603
409 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 605
411 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 610 $job->[2]->send;
415 Coro::cede;
416 goto next_job; 611 goto next_job;
417 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 614 }
419 } 615 }
420 616
421 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
423 push @cf::WAIT_FOR_TICK, $signal;
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($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
433 628
434 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
435 630
436 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
437 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
438 634
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
467=cut 663=cut
468 664
469sub sync_job(&) { 665sub sync_job(&) {
470 my ($job) = @_; 666 my ($job) = @_;
471 667
472 if ($Coro::current == $Coro::main) { 668 if (in_main) {
473 my $time = EV::time; 669 my $time = AE::time;
474 670
475 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
477 673
478 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
479 675
480 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
481 677
482 my $busy = 1; 678 my $busy = 1;
483 my @res; 679 my @res;
484 680
485 (async { 681 (async {
486 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 683 @res = eval { $job->() };
488 warn $@ if $@; 684 error $@ if $@;
489 undef $busy; 685 undef $busy;
490 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
491 687
492 while ($busy) { 688 while ($busy) {
493 if (Coro::nready) { 689 if (Coro::nready) {
494 Coro::cede_notself; 690 Coro::cede_notself;
495 } else { 691 } else {
496 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
497 } 693 }
498 } 694 }
499 695
500 my $time = EV::time - $time; 696 my $time = AE::time - $time;
501 697
502 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
503 699
504 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
505 } else { 701 } else {
527 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
528 724
529 $coro 725 $coro
530} 726}
531 727
532=item fork_call { }, $args 728=item fork_call { }, @args
533 729
534Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 733never block itself or use any form of event handling.
538 734
539=cut 735=cut
540 736
737sub post_fork {
738 reset_signals;
739}
740
541sub fork_call(&@) { 741sub fork_call(&@) {
542 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
543 743
544 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious)
547
548 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
549 reset_signals; 745 cf::post_fork;
550 &$cb 746 &$cb
551 }, @args; 747 } @args;
552 748
553 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 )
554} 761}
555 762
556=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
557 764
558=cut 765=cut
595within each server. 802within each server.
596 803
597=cut 804=cut
598 805
599sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
600 my ($name) = @_; 810 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
602 812
603 eval { 813 eval {
604 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
614} 824}
615 825
616our $DB; 826our $DB;
617 827
618sub db_init { 828sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
621 };
622} 830}
623 831
624sub db_get($$) { 832sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
626 834
627 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
628 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
629 839
630 $! ? () 840 $! ? ()
631 : $data 841 : $data
632 }
633} 842}
634 843
635sub db_put($$$) { 844sub db_put($$$) {
636 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 874
666 my @data; 875 my @data;
667 my $md5; 876 my $md5;
668 877
669 for (0 .. $#$src) { 878 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 880 }
673 881
674 # if processing is expensive, check 882 # if processing is expensive, check
675 # checksum first 883 # checksum first
676 if (1) { 884 if (1) {
689 897
690 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
691 } 899 }
692 } 900 }
693 901
694 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
695 my $data = $process->(\@data); 903 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
697 905
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 907
700 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
703 911
713 921
714=cut 922=cut
715 923
716sub datalog($@) { 924sub datalog($@) {
717 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 927}
720 928
721=back 929=back
722 930
723=cut 931=cut
724 932
725############################################################################# 933#############################################################################
726 934
727=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
728 936
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
732 940
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
785 993
786Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
788 996
789Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 999
792These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
793 1001
794=over 4 1002=over 4
918 1126
919 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1129
922 } elsif (ref $type) { 1130 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
924 1132
925 } else { 1133 } else {
926 shift @arg; 1134 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
928 } 1136 }
929 } 1137 }
930} 1138}
931 1139
932sub _object_attach { 1140sub _object_attach {
942 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
943 } 1151 }
944 1152
945 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
946 } else { 1154 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1156 }
949 1157
950 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
951} 1159}
952 1160
1011 1219
1012 for (@$callbacks) { 1220 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1014 1222
1015 if ($@) { 1223 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1225 override;
1019 } 1226 }
1020 1227
1021 return 1 if $override; 1228 return 1 if $override;
1022 } 1229 }
1085 1292
1086sub reattach { 1293sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1295 my ($obj) = @_;
1089 1296
1297 # no longer needed after getting rid of delete_package?
1090 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
1091 1299
1092 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
1093 1301
1094 @$registry = (); 1302 @$registry = ();
1095 1303
1100 for (@$attach) { 1308 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1103 } 1311 }
1104 } else { 1312 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1314 }
1107 } 1315 }
1108} 1316}
1109 1317
1110cf::attachable->attach ( 1318cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1138 1346
1139 sync_job { 1347 sync_job {
1140 if (length $$rdata) { 1348 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1144 1353
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1355 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1361 aio_close $fh;
1150 1362
1151 if (@$objs) { 1363 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1365 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1372 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1374 }
1160 } else { 1375 } else {
1161 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1162 } 1377 }
1163 1378
1164 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1383 } else {
1166 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1167 } 1385 }
1168 } else { 1386 } else {
1169 aio_unlink $filename; 1387 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1171 } 1389 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1414 $av = $st->{objs};
1197 } 1415 }
1198 1416
1199 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1202 1421
1203 ($data, $av) 1422 ($data, $av)
1204} 1423}
1205 1424
1206=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1210=cut 1429=cut
1211 1430
1212############################################################################# 1431#############################################################################
1213# command handling &c 1432# command handling &c
1214 1433
1215=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1216 1435
1217Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1218$name. 1437$name.
1219 1438
1220=cut 1439=cut
1226 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1227 1446
1228 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1229} 1448}
1230 1449
1231=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1232 1451
1233Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1236the 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
1237has logged in successfully. 1456has logged in successfully.
1238 1457
1239If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1240called.
1241 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
1242=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1243 1466
1244Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1245exticmd 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
1246are 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
1247is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1248log-in. 1471log-in.
1249 1472
1250If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1251called.
1252 1474
1253=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1254 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
1255sub register_extcmd { 1482sub register_extcmd($$) {
1256 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1257 1484
1258 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1259} 1486}
1260 1487
1261sub register_exticmd { 1488sub register_async_extcmd($$) {
1262 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1263 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1264 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1265} 1498}
1266 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1267cf::player->attach ( 1508cf::player->attach (
1268 on_command => sub { 1509 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1270 1511
1271 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1272 or return; 1513 or return;
1273 1514
1281 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1282 1523
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1525
1285 if (ref $msg) { 1526 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1528
1291 my @reply;
1292
1293 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}) {
1294 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1295 } 1547 }
1296 1548
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1300 } else { 1549 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1551 }
1303 1552
1304 cf::override; 1553 cf::override;
1305 }, 1554 },
1306); 1555);
1307 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
1308sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1309 cf::sync_job { 1586 cf::sync_job {
1310 my %todo; 1587 my %todo;
1311 1588
1312 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1590 next unless -r $path;
1331 1608
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1611
1335 $ext{source} = 1612 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1338 . $source 1615 . $source
1339 . "\n};\n1"; 1616 . "\n};\n1";
1340 1617
1341 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1342 } 1619 }
1343 1620
1621 my $pass = 0;
1344 my %done; 1622 my %done;
1345 while (%todo) { 1623 while (%todo) {
1346 my $progress; 1624 my $progress;
1347 1625
1626 ++$pass;
1627
1628 ext:
1348 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1631 next ext
1351 unless exists $done{$_}; 1632 unless exists $done{$_};
1352 } 1633 }
1353 1634
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1636
1356 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 $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1650
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1652 if exists $v->{meta}{mandatory};
1364 1653
1365 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;
1366 } 1663 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1664 }
1372 1665
1373 skip: 1666 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1676 }
1377 }; 1677 };
1378} 1678}
1379 1679
1380############################################################################# 1680#############################################################################
1381 1681
1382=back 1682=back
1383 1683
1384=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1385 1685
1386Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1387 1687
1388=cut 1688=cut
1389 1689
1390package cf::player; 1690package cf::player;
1391 1691
1434 1734
1435sub exists($) { 1735sub exists($) {
1436 my ($login) = @_; 1736 my ($login) = @_;
1437 1737
1438 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1440} 1740}
1441 1741
1442sub find($) { 1742sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1744 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1756 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1757 or return;
1458 1758
1459 my $pl = cf::player::load_pl $f 1759 my $pl = cf::player::load_pl $f
1460 or return; 1760 or return;
1761
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1762 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1763 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1464 } 1765 }
1465 } 1766 }
1466} 1767}
1467 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
1468sub save($) { 1782sub save($) {
1469 my ($pl) = @_; 1783 my ($pl) = @_;
1470 1784
1471 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1472 1786
1477 1791
1478 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1480 1794
1481 cf::get_slot 0.01; 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];
1482 1799
1483 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1801 cf::cede_to_tick;
1485} 1802}
1486 1803
1518 my ($pl) = @_; 1835 my ($pl) = @_;
1519 1836
1520 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1521 1838
1522 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1523 $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
1524 1841
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1528 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1529 1850
1530 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1570 1891
1571 for my $login (@$dirs) { 1892 for my $login (@$dirs) {
1572 my $path = path $login; 1893 my $path = path $login;
1573 1894
1574 # a .pst is a dead give-away for a valid player 1895 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1896 # if no pst file found, open and chekc for blocked users
1897 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1898 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1899 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1900 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1901 }
1580 1902
1584 1906
1585 \@logins 1907 \@logins
1586} 1908}
1587 1909
1588=item $player->maps 1910=item $player->maps
1911
1912=item cf::player::maps $login
1589 1913
1590Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1591player. May block. 1915player. May block.
1592 1916
1593=cut 1917=cut
1611 } 1935 }
1612 1936
1613 \@paths 1937 \@paths
1614} 1938}
1615 1939
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1941
1618Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708
1709=item $player->ext_reply ($msgid, @msg)
1710
1711Sends an ext reply to the player.
1712
1713=cut
1714
1715sub ext_reply($$@) {
1716 my ($self, $id, @msg) = @_;
1717
1718 $self->ns->ext_reply ($id, @msg)
1719}
1720 1943
1721=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1722 1945
1723Sends an ext event to the client. 1946Sends an ext event to the client.
1724 1947
1744 1967
1745=cut 1968=cut
1746 1969
1747sub find_by_path($) { 1970sub find_by_path($) {
1748 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1749 1974
1750 my ($match, $specificity); 1975 my ($match, $specificity);
1751 1976
1752 for my $region (list) { 1977 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 2007sub generate_random_map {
1783 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1784 2009
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 2011
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 2013}
1802 2014
1803=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1804 2016
1805Register 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
1810 2022
1811sub register { 2023sub register {
1812 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2025 my $pkg = caller;
1814 2026
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2028
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2030}
1820 2031
1821# also paths starting with '/' 2032# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2034
1824sub thawer_merge { 2035sub thawer_merge {
1825 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1826 2037
1827 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1832} 2043}
1833 2044
1834sub normalise { 2045sub normalise {
1835 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1836 2047
1837 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1838 2049
1839 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1840 2051
1841 # map plan: 2052 # map plan:
1842 # 2053 #
1857 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2069 $path = "$base/$path";
1859 } 2070 }
1860 2071
1861 for ($path) { 2072 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1865 } 2075 }
1866 2076
1867 $path 2077 $path
1881 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1882 return $self; 2092 return $self;
1883 } 2093 }
1884 } 2094 }
1885 2095
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2097 ()
1888} 2098}
1889 2099
2100# may re-bless or do other evil things
1890sub init { 2101sub init {
1891 my ($self) = @_; 2102 my ($self) = @_;
1892 2103
1893 $self 2104 $self
1894} 2105}
1925 2136
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1928} 2139}
1929 2140
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 2141sub decay_objects {
1940 my ($self) = @_; 2142 my ($self) = @_;
1941 2143
1942 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1943 2145
1968 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1969 2171
1970 1 2172 1
1971} 2173}
1972 2174
2175# used to laod the header of an original map
1973sub load_header_orig { 2176sub load_header_orig {
1974 my ($self) = @_; 2177 my ($self) = @_;
1975 2178
1976 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1977} 2180}
1978 2181
2182# used to laod the header of an instantiated map
1979sub load_header_temp { 2183sub load_header_temp {
1980 my ($self) = @_; 2184 my ($self) = @_;
1981 2185
1982 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1983} 2187}
1984 2188
2189# called after loading the header from an instantiated map
1985sub prepare_temp { 2190sub prepare_temp {
1986 my ($self) = @_; 2191 my ($self) = @_;
1987 2192
1988 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1990 # safety 2195 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2198}
1994 2199
2200# called after loading the header from an original map
1995sub prepare_orig { 2201sub prepare_orig {
1996 my ($self) = @_; 2202 my ($self) = @_;
1997 2203
1998 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2023 2229
2024sub find; 2230sub find;
2025sub find { 2231sub find {
2026 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2027 2233
2234 cf::cede_to_tick;
2235
2028 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2029 2237
2030 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2240
2033 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
2038 or return; 2243 or return;
2039 2244
2040 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
2041 2246
2043 or return; 2248 or return;
2044 2249
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2250 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2251 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2252 #$cf::WAIT_FOR_TICK->wait;
2253 undef $guard2;
2048 undef $guard1; 2254 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2255 $map->reset;
2051 return find $path; 2256 return find $path;
2052 } 2257 }
2053 2258
2054 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2055 } 2260 }
2056} 2261}
2057 2262
2058sub pre_load { } 2263sub pre_load { }
2059sub post_load { } 2264#sub post_load { } # XS
2060 2265
2061sub load { 2266sub load {
2062 my ($self) = @_; 2267 my ($self) = @_;
2063 2268
2064 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2067 2272
2068 { 2273 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2070 2275
2071 return unless $self->valid; 2276 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2278
2076 $self->alloc; 2279 $self->alloc;
2077 2280
2078 $self->pre_load; 2281 $self->pre_load;
2079 cf::cede_to_tick; 2282 cf::cede_to_tick;
2080 2283
2284 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2286 $f->skip_block;
2083 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2084 or return; 2288 or return;
2085 2289
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
2087 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2088 2292
2089 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2294 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2297 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2096 } 2301 }
2097 } 2302 }
2098 }
2099 2303
2100 $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);
2101 2311
2102 cf::cede_to_tick; 2312 cf::cede_to_tick;
2103 # now do the right thing for maps 2313 # now do the right thing for maps
2104 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2109 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2320 $self->decay_objects;
2111 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2112 $self->update_buttons; 2322 $self->update_buttons;
2113 cf::cede_to_tick; 2323 cf::cede_to_tick;
2114 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2325 }
2118 2326
2119 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2329 }
2124 2330
2125 $self->post_load; 2331 $self->post_load;
2126}
2127 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
2128sub customise_for { 2339sub customise_for {
2129 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2130 2341
2131 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2343 if $self->per_player;
2135# if $self->per_party; 2346# if $self->per_party;
2136 2347
2137 $self 2348 $self
2138} 2349}
2139 2350
2140# find and load all maps in the 3x3 area around a map
2141sub load_neighbours {
2142 my ($map) = @_;
2143
2144 my @neigh; # diagonal neighbours
2145
2146 for (0 .. 3) {
2147 my $neigh = $map->tile_path ($_)
2148 or next;
2149 $neigh = find $neigh, $map
2150 or next;
2151 $neigh->load;
2152
2153 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 }
2157
2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
2160 my $neigh = find $path, $origin
2161 or next;
2162 $neigh->load;
2163 }
2164}
2165
2166sub find_sync { 2351sub find_sync {
2167 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2168 2353
2169 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
2170} 2359}
2171 2360
2172sub do_load_sync { 2361sub do_load_sync {
2173 my ($map) = @_; 2362 my ($map) = @_;
2174 2363
2364 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2177 2367
2178 cf::sync_job { $map->load }; 2368 $map->load;
2179} 2369}
2180 2370
2181our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2183 2373
2184sub find_async { 2374sub find_async {
2185 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2186 2376
2187 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2188 2378
2189 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2191 } 2381 }
2192 2382
2193 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2194 2384
2195 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2210 2400
2211 () 2401 ()
2212} 2402}
2213 2403
2404# common code, used by both ->save and ->swapout
2214sub save { 2405sub _save {
2215 my ($self) = @_; 2406 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2407
2219 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2220 2409
2221 return unless $self->dirty; 2410 return unless $self->dirty;
2222 2411
2242 } else { 2431 } else {
2243 $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);
2244 } 2433 }
2245} 2434}
2246 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2247sub swap_out { 2444sub swap_out {
2248 my ($self) = @_; 2445 my ($self) = @_;
2249 2446
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2255 return if $self->players; 2451 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 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
2257 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2258 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
2259 $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};
2260 2503
2261 $self->deactivate; 2504 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2506 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2507
2309 $self->unlink_save; 2508 $self->unlink_save;
2310 $self->destroy; 2509 $self->destroy;
2311} 2510}
2312 2511
2320 2519
2321 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2322 2521
2323 $self->unlink_save; 2522 $self->unlink_save;
2324 2523
2325 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2529
2387 : normalise $_ 2586 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2588 ]
2390} 2589}
2391 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
2392=back 2623=back
2393 2624
2394=head3 cf::object 2625=head3 cf::object
2395 2626
2396=cut 2627=cut
2419 2650
2420Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2421 2652
2422=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2423 2654
2424returns 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,
2425even if the object actually exists. May block. 2656even if the object actually exists. May block.
2426 2657
2427=cut 2658=cut
2428 2659
2429sub deref { 2660sub deref {
2457can 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
2458dialogue with the given NPC character. 2689dialogue with the given NPC character.
2459 2690
2460=cut 2691=cut
2461 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
2462# rough implementation of a future "reply" method that works 2707# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2708# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2710sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2711 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2722 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2724
2480 } else { 2725 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2726 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2727 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2728 }
2484 } 2729 }
2485} 2730}
2486 2731
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2732=item $object->send_msg ($channel, $msg, $color, [extra...])
2497=item $player_object->may ("access") 2742=item $player_object->may ("access")
2498 2743
2499Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2500(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2501 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2502=cut 2772=cut
2503 2773
2504sub cf::object::player::may { 2774sub cf::object::player::may {
2505 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2506 2776
2507 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2508 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2509 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2510 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2511} 2781}
2512 2782
2513=item $player_object->enter_link 2783=item $player_object->enter_link
2514 2784
2515Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2516 2786
2517The player should be reasonably safe there for short amounts of time. You 2787The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2789though, as the player cannot control the character while it is on the link
2790map.
2519 2791
2520Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2521 2799
2522=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2523 2801
2524Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2525map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2543sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2544 my ($self) = @_; 2822 my ($self) = @_;
2545 2823
2546 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2547 2825
2826 ++$self->{_link_recursion};
2827
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2829
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2552 2832
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2834}
2555 2835
2556sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2558 2838
2575 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2577 2857
2578 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2581 2861
2582 $map->load; 2862 $map->load;
2583 $map->load_neighbours;
2584 2863
2585 return unless $self->contr->active; 2864 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2865
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2590} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2591 2873
2874}
2875
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2876=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2877
2594Moves the player to the given map-path and coordinates by first freezing 2878Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2880that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2881the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2882be called at the end of this process.
2599 2883
2884Note that $check will be called with a potentially non-loaded map, so if
2885it needs a loaded map it has to call C<< ->load >>.
2886
2600=cut 2887=cut
2601 2888
2602our $GOTOGEN; 2889our $GOTOGEN;
2603 2890
2604sub cf::object::player::goto { 2891sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2892 my ($self, $path, $x, $y, $check, $done) = @_;
2893
2894 if ($self->{_link_recursion} >= $MAX_LINKS) {
2895 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2896 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2897 ($path, $x, $y) = @$EMERGENCY_POSITION;
2898 }
2606 2899
2607 # do generation counting so two concurrent goto's will be executed in-order 2900 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2902
2610 $self->enter_link; 2903 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2631 } 2924 }
2632 } 2925 }
2633 2926
2634 my $map = eval { 2927 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2929
2637 if ($map) { 2930 if ($map) {
2638 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2933 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2934 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2935 }
2643 2936
2644 $map 2937 $map
2652 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2655 } 2948 }
2656 2949
2657 $done->() if $done; 2950 $done->($self) if $done;
2658 })->prio (1); 2951 })->prio (1);
2659} 2952}
2660 2953
2661=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2662 2955
2682} 2975}
2683 2976
2684sub prepare_random_map { 2977sub prepare_random_map {
2685 my ($exit) = @_; 2978 my ($exit) = @_;
2686 2979
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2980 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2981 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2982 # that depends on the exit object
2692 2983
2693 my $rmp = parse_random_map_params $exit->msg; 2984 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2986 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2987 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2988 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2989 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2990 $rmp->{origin_y} = $exit->y;
2991
2992 $exit->map->touch;
2700 } 2993 }
2701 2994
2702 $rmp->{random_seed} ||= $exit->random_seed; 2995 $rmp->{random_seed} ||= $exit->random_seed;
2703 2996
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2997 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3001 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 3002 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 3003 undef $fh;
2711 aio_rename "$meta~", $meta; 3004 aio_rename "$meta~", $meta;
2712 3005
3006 my $slaying = "?random/$md5";
3007
3008 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 3009 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 3010 $exit->msg (undef);
3011 }
2715 } 3012 }
2716} 3013}
2717 3014
2718sub cf::object::player::enter_exit { 3015sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 3016 my ($self, $exit) = @_;
2720 3017
2721 return unless $self->type == cf::PLAYER; 3018 return unless $self->type == cf::PLAYER;
2722 3019
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 3020 $self->enter_link;
2735 3021
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 3022 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3023 $Coro::current->{desc} = "enter_exit";
2742 3024
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 3025 unless (eval {
3026 $self->deactivate_recursive; # just to be sure
3027
3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
3029 my $x = $exit->stats->hp;
3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
3054
2745 $self->goto ($slaying, $hp, $sp); 3055 $self->goto ($map, $x, $y);
2746 3056
3057 # if exit is damned, update players death & WoR home-position
3058 $self->contr->savebed ($map, $x, $y)
3059 if $exit->flag (cf::FLAG_DAMNED);
3060
2747 1; 3061 1
2748 }) { 3062 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 3064 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2753 3067
2754 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 3069 $self->leave_link;
2756 } 3070 }
2757 })->prio (1); 3071 })->prio (1);
2758} 3072}
2759 3073
2760=head3 cf::client 3074=head3 cf::client
2761 3075
2762=over 4 3076=over 4
2763 3077
2764=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2765 3079
2766Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2767should not be used under normal circumstances. 3081them as required.
2768 3082
2769=cut 3083=cut
2770 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2771sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2772 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2773 3089
2774 utf8::encode $text; 3090 # try lzf for large packets
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3091 $pkt = "lzf " . Compress::LZF::compress $pkt
3092 if 1024 <= length $pkt and $self->{can_lzf};
3093
3094 # split very large packets
3095 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3096 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3097 $pkt = "frag";
3098 }
3099
3100 $self->send_packet ($pkt);
2776} 3101}
2777 3102
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3104
2780Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2781client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2782the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2783the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2784 3109
2785=cut 3110=cut
2786 3111
2787# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2789 "c/identify" => { 3120 "c/identify" => {
2790 id => "infobox", 3121 id => "infobox",
2791 title => "Identify", 3122 title => "Identify",
2792 reply => undef, 3123 reply => undef,
2793 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2795 "c/examine" => { 3126 "c/examine" => {
2796 id => "infobox", 3127 id => "infobox",
2797 title => "Examine", 3128 title => "Examine",
2798 reply => undef, 3129 reply => undef,
2799 tooltip => "Signs and other items you examined", 3130 tooltip => "Signs and other items you examined",
3131 },
3132 "c/shopinfo" => {
3133 id => "infobox",
3134 title => "Shop Info",
3135 reply => undef,
3136 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3137 },
2801 "c/book" => { 3138 "c/book" => {
2802 id => "infobox", 3139 id => "infobox",
2803 title => "Book", 3140 title => "Book",
2804 reply => undef, 3141 reply => undef,
2820 id => "infobox", 3157 id => "infobox",
2821 title => "Body Parts", 3158 title => "Body Parts",
2822 reply => undef, 3159 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3160 tooltip => "Shows which body parts you posess and are available",
2824 }, 3161 },
3162 "c/statistics" => {
3163 id => "infobox",
3164 title => "Statistics",
3165 reply => undef,
3166 tooltip => "Shows your primary statistics",
3167 },
3168 "c/skills" => {
3169 id => "infobox",
3170 title => "Skills",
3171 reply => undef,
3172 tooltip => "Shows your experience per skill and item power",
3173 },
3174 "c/shopitems" => {
3175 id => "infobox",
3176 title => "Shop Items",
3177 reply => undef,
3178 tooltip => "Shows the items currently for sale in this shop",
3179 },
3180 "c/resistances" => {
3181 id => "infobox",
3182 title => "Resistances",
3183 reply => undef,
3184 tooltip => "Shows your resistances",
3185 },
3186 "c/pets" => {
3187 id => "infobox",
3188 title => "Pets",
3189 reply => undef,
3190 tooltip => "Shows information abotu your pets/a specific pet",
3191 },
3192 "c/perceiveself" => {
3193 id => "infobox",
3194 title => "Perceive Self",
3195 reply => undef,
3196 tooltip => "You gained detailed knowledge about yourself",
3197 },
2825 "c/uptime" => { 3198 "c/uptime" => {
2826 id => "infobox", 3199 id => "infobox",
2827 title => "Uptime", 3200 title => "Uptime",
2828 reply => undef, 3201 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3202 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3205 id => "infobox",
2833 title => "Map Info", 3206 title => "Map Info",
2834 reply => undef, 3207 reply => undef,
2835 tooltip => "Information related to the maps", 3208 tooltip => "Information related to the maps",
2836 }, 3209 },
3210 "c/party" => {
3211 id => "party",
3212 title => "Party",
3213 reply => "gsay ",
3214 tooltip => "Messages and chat related to your party",
3215 },
3216 "c/death" => {
3217 id => "death",
3218 title => "Death",
3219 reply => undef,
3220 tooltip => "Reason for and more info about your most recent death",
3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3228 "c/say" => $SAY_CHANNEL,
3229 "c/chat" => $CHAT_CHANNEL,
2837); 3230);
2838 3231
2839sub cf::client::send_msg { 3232sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3233 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3234
2842 $msg = $self->pl->expand_cfpod ($msg); 3235 $msg = $self->pl->expand_cfpod ($msg)
3236 unless $color & cf::NDI_VERBATIM;
2843 3237
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3238 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3239
2846 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2849 3243
2850 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2854 3246
2855 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3252 }
2862 3253
2863 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2864 } 3255 }
2865 3256
2866 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2867 3258
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3259 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2872 3262
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3263 my $pkt = "msg "
3264 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3266 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3267
2887 $color &= cf::NDI_COLOR_MASK; 3268 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3269}
2901 3270
2902=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2903 3272
2904Sends an ext event to the client. 3273Sends an ext event to the client.
2906=cut 3275=cut
2907 3276
2908sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2910 3279
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3281}
2936 3282
2937=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2938 3284
2939Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2959 3305
2960 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2961 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2962 3308
2963 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
2964} 3349}
2965 3350
2966cf::client->attach ( 3351cf::client->attach (
2967 on_connect => sub { 3352 on_connect => sub {
2968 my ($ns) = @_; 3353 my ($ns) = @_;
2994 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2995 3380
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3382
2998 if (ref $msg) { 3383 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3385
3004 my @reply;
3005
3006 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3008 } 3404 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
3013 } else { 3405 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3407 }
3016 3408
3017 cf::override; 3409 cf::override;
3018 }, 3410 },
3019); 3411);
3039 3431
3040 $coro 3432 $coro
3041} 3433}
3042 3434
3043cf::client->attach ( 3435cf::client->attach (
3044 on_destroy => sub { 3436 on_client_destroy => sub {
3045 my ($ns) = @_; 3437 my ($ns) = @_;
3046 3438
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3440 },
3049); 3441);
3065our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
3066 3458
3067$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
3068 3460
3069$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
3072 sort time 3464 sort time
3073)); 3465));
3074 3466
3075# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
3079The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
3080 3472
3081 cf::object 3473 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3474 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease split 3475 insert remove name archname title slaying race decrease split
3476 value
3084 3477
3085 cf::object::player 3478 cf::object::player
3086 player 3479 player
3087 3480
3088 cf::player 3481 cf::player
3093 3486
3094=cut 3487=cut
3095 3488
3096for ( 3489for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3490 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
3099 decrease split destroy)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3103) { 3496) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3499 for @funs;
3108} 3500}
3109 3501
3124 3516
3125 my $qcode = $code; 3517 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
3128 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
3129 local $_; 3524 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3525
3132 my $eval = 3526 my $eval =
3133 "do {\n" 3527 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3530 . $code
3137 . "\n}" 3531 . "\n}"
3138 ; 3532 ;
3139 3533
3534 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3538 sub_generation_inc;
3539 } else {
3540 local @cf::_safe_eval_args = values %vars;
3541 @res = wantarray ? eval eval : scalar eval $eval;
3542 }
3143 3543
3144 if ($@) { 3544 if ($@) {
3145 warn "$@"; 3545 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3148 } 3548 }
3149 3549
3150 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3151} 3551}
3152 3552
3166=cut 3566=cut
3167 3567
3168sub register_script_function { 3568sub register_script_function {
3169 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
3170 3570
3171 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
3173} 3573}
3174 3574
3175=back 3575=back
3176 3576
3177=cut 3577=cut
3178 3578
3179############################################################################# 3579#############################################################################
3180# the server's init and main functions 3580# the server's init and main functions
3181 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3182sub load_facedata($) { 3659sub load_facedata($) {
3183 my ($path) = @_; 3660 my ($path) = @_;
3184 3661
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3663
3191 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3192 3665
3193 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3667
3199 $facedata->{version} == 2 3668 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3201 3670
3202 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3203 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3204 type => FT_RSRC, 3673
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3206 }; 3675
3207 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3208 3679
3209 { 3680 {
3210 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3211 3682
3212 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3686
3215 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3219 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3220 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3221 } 3694 }
3222 3695
3223 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3224 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3225 3698
3228 3701
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3705 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3707 }
3235
3236 cf::cede_to_tick;
3237 } 3708 }
3238 } 3709 }
3239 3710
3240 { 3711 {
3241 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3242 3713
3243 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3244 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3245 cf::cede_to_tick;
3246 } 3716 }
3247 3717
3248 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3249 } 3719 }
3250 3720
3251 { 3721 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3255 3723
3256 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3728
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3276 } else { 3735 } else {
3277 $RESOURCE{$name} = $info; 3736# $RESOURCE{$name} = $info; # unused
3278 } 3737 }
3279
3280 cf::cede_to_tick;
3281 } 3738 }
3282 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3283 3750
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3752
3753 aio_close $fh if $fh; # close old facedata
3754
3286 1 3755 1
3287} 3756}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3757
3309register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3759 my ($ns, $want) = @_;
3311 3760
3312 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3320 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3322 cf::arch::commit_load; 3771 cf::arch::commit_load;
3323 3772
3324 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3325} 3788}
3326 3789
3327sub reload_regions { 3790sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?) 3792 # for this (global event?)
3337 if exists $_->{match}; 3800 if exists $_->{match};
3338 } 3801 }
3339} 3802}
3340 3803
3341sub reload_facedata { 3804sub reload_facedata {
3342 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3343 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3344} 3807}
3345 3808
3346sub reload_archetypes { 3809sub reload_archetypes {
3347 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3348 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3349} 3838}
3350 3839
3351sub reload_treasures { 3840sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3354} 3843}
3355 3844
3845sub reload_sound {
3846 trace "loading sound config from $DATADIR/sound\n";
3847
3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3849
3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3851 my $sound = $soundconf->{compat}[$_]
3852 or next;
3853
3854 my $face = cf::face::find "sound/$sound->[1]";
3855 cf::sound::set $sound->[0] => $face;
3856 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3857 }
3858
3859 while (my ($k, $v) = each %{$soundconf->{event}}) {
3860 my $face = cf::face::find "sound/$v";
3861 cf::sound::set $k => $face;
3862 }
3863}
3864
3356sub reload_resources { 3865sub reload_resources {
3357 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3358 3867
3868 reload_materials;
3359 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3360 reload_archetypes; 3872 reload_archetypes;
3361 reload_regions; 3873 reload_regions;
3362 reload_treasures; 3874 reload_treasures;
3363 3875
3364 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3365}
3366
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371} 3877}
3372 3878
3373sub reload_config { 3879sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3375 or return;
3376 3881
3377 local $/; 3882 my $config = load_file "$CONFDIR/config";
3378 *CFG = YAML::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3379 3885
3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3381 3887
3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3384 3890
3385 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3389 }; 3895 };
3390 warn $@ if $@; 3896 warn $@ if $@;
3391 } 3897 }
3392} 3898}
3393 3899
3900sub pidfile() {
3901 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3902 or die "$PIDFILE: $!";
3903 flock $fh, &Fcntl::LOCK_EX
3904 or die "$PIDFILE: flock: $!";
3905 $fh
3906}
3907
3908# make sure only one server instance is running at any one time
3909sub atomic {
3910 my $fh = pidfile;
3911
3912 my $pid = <$fh>;
3913 kill 9, $pid if $pid > 0;
3914
3915 seek $fh, 0, 0;
3916 print $fh $$;
3917}
3918
3919sub main_loop {
3920 trace "EV::run starting\n";
3921 if (1) {
3922 EV::run;
3923 }
3924 trace "EV::run returned\n";
3925 goto &main_loop unless $REALLY_UNLOOP;
3926}
3927
3394sub main { 3928sub main {
3929 cf::init_globals; # initialise logging
3930
3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3935
3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3937
3395 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3398 (async { 3941 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3402 }; 3945 };
3403 3946
3404 { 3947 evthread_start IO::AIO::poll_fileno;
3405 my $guard = freeze_mainloop; 3948
3949 cf::sync_job {
3950 cf::incloader::init ();
3951
3952 db_init;
3953
3954 cf::init_anim;
3955 cf::init_attackmess;
3956 cf::init_dynamic;
3957
3958 cf::load_settings;
3959
3960 reload_resources;
3406 reload_config; 3961 reload_config;
3407 db_init; 3962
3963 cf::init_uuid;
3964 cf::init_signals;
3965 cf::init_skills;
3966
3967 cf::init_beforeplay;
3968
3969 atomic;
3970
3408 load_extensions; 3971 load_extensions;
3409 3972
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3973 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 3974
3975 # no (long-running) fork's whatsoever before this point(!)
3976 use POSIX ();
3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3978
3979 cf::_post_init 0;
3412 } 3980 };
3413 3981
3414 EV::loop; 3982 cf::object::thawer::errors_are_fatal 0;
3983 info "parse errors in files are no longer fatal from this point on.\n";
3984
3985 AE::postpone {
3986 undef &main; # free gobs of memory :)
3987 };
3988
3989 goto &main_loop;
3415} 3990}
3416 3991
3417############################################################################# 3992#############################################################################
3418# initialisation and cleanup 3993# initialisation and cleanup
3419 3994
3420# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3421BEGIN { 3996BEGIN {
3422 our %SIGWATCHER = (); 3997 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3426 }; 4001 };
3427 } 4002 }
3428} 4003}
3429 4004
3430sub write_runtime_sync { 4005sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime"; 4006 my $t0 = AE::time;
3432 4007
3433 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3435 4010
3436 IO::AIO::aio_utime $runtime, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 4012
3438 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3439 4014
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3441 or return; 4016 or return;
3442 4017
3443 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3455 aio_utime $fh, undef, undef; 4030 aio_utime $fh, undef, undef;
3456 4031
3457 close $fh 4032 close $fh
3458 or return; 4033 or return;
3459 4034
3460 aio_rename "$runtime~", $runtime 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 4036 and return;
3462 4037
3463 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3464 4039
3465 1 4040 1
3466} 4041}
3467 4042
3468our $uuid_lock; 4043our $uuid_lock;
3477 my $uuid = "$LOCALDIR/uuid"; 4052 my $uuid = "$LOCALDIR/uuid";
3478 4053
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4054 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 4055 or return;
3481 4056
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 4057 my $value = uuid_seq uuid_cur;
4058
4059 unless ($value) {
4060 info "cowardly refusing to write zero uuid value!\n";
4061 return;
4062 }
4063
4064 my $value = uuid_str $value + $uuid_skip;
3483 $uuid_skip = 0; 4065 $uuid_skip = 0;
3484 4066
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4067 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 4068 and return;
3487 4069
3493 or return; 4075 or return;
3494 4076
3495 aio_rename "$uuid~", $uuid 4077 aio_rename "$uuid~", $uuid
3496 and return; 4078 and return;
3497 4079
3498 warn "uuid file written ($value).\n"; 4080 trace "uuid file written ($value).\n";
3499 4081
3500 1 4082 1
3501 4083
3502} 4084}
3503 4085
3509} 4091}
3510 4092
3511sub emergency_save() { 4093sub emergency_save() {
3512 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3513 4095
3514 warn "enter emergency perl save\n"; 4096 info "emergency_perl_save: enter\n";
4097
4098 # this is a trade-off: we want to be very quick here, so
4099 # save all maps without fsync, and later call a global sync
4100 # (which in turn might be very very slow)
4101 local $USE_FSYNC = 0;
3515 4102
3516 cf::sync_job { 4103 cf::sync_job {
4104 cf::write_runtime_sync; # external watchdog should not bark
4105
3517 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3518 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3519 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3520 warn "begin emergency player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3521 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3522 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3523 $pl->valid or next; 4112 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3525 $pl->save; 4114 $pl->save;
3526 } 4115 }
3527 warn "end emergency player save\n"; 4116 info "emergency_perl_save: end player save\n";
3528 4117
3529 warn "begin emergency map save\n"; 4118 cf::write_runtime_sync; # external watchdog should not bark
4119
4120 info "emergency_perl_save: begin map save\n";
3530 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3531 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3532 $map->valid or next; 4123 $map->valid or next;
3533 $map->save; 4124 $map->save;
3534 } 4125 }
3535 warn "end emergency map save\n"; 4126 info "emergency_perl_save: end map save\n";
3536 4127
3537 warn "begin emergency database checkpoint\n"; 4128 cf::write_runtime_sync; # external watchdog should not bark
4129
4130 info "emergency_perl_save: begin database checkpoint\n";
3538 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3539 warn "end emergency database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
3540 4133
3541 warn "begin write uuid\n"; 4134 info "emergency_perl_save: begin write uuid\n";
3542 write_uuid_sync 1; 4135 write_uuid_sync 1;
3543 warn "end write uuid\n"; 4136 info "emergency_perl_save: end write uuid\n";
4137
4138 cf::write_runtime_sync; # external watchdog should not bark
4139
4140 trace "emergency_perl_save: syncing database to disk";
4141 BDB::db_env_txn_checkpoint $DB_ENV;
4142
4143 info "emergency_perl_save: starting sync\n";
4144 IO::AIO::aio_sync sub {
4145 info "emergency_perl_save: finished sync\n";
4146 };
4147
4148 cf::write_runtime_sync; # external watchdog should not bark
4149
4150 trace "emergency_perl_save: flushing outstanding aio requests";
4151 while (IO::AIO::nreqs || BDB::nreqs) {
4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4153 }
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
3544 }; 4156 };
3545 4157
3546 warn "leave emergency perl save\n"; 4158 info "emergency_perl_save: leave\n";
3547} 4159}
3548 4160
3549sub post_cleanup { 4161sub post_cleanup {
3550 my ($make_core) = @_; 4162 my ($make_core) = @_;
3551 4163
4164 IO::AIO::flush;
4165
3552 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 4167 if $make_core;
4168
4169 my $fh = pidfile;
4170 unlink $PIDFILE if <$fh> == $$;
4171}
4172
4173# a safer delete_package, copied from Symbol
4174sub clear_package($) {
4175 my $pkg = shift;
4176
4177 # expand to full symbol table name if needed
4178 unless ($pkg =~ /^main::.*::$/) {
4179 $pkg = "main$pkg" if $pkg =~ /^::/;
4180 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4181 $pkg .= '::' unless $pkg =~ /::$/;
4182 }
4183
4184 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4185 my $stem_symtab = *{$stem}{HASH};
4186
4187 defined $stem_symtab and exists $stem_symtab->{$leaf}
4188 or return;
4189
4190 # clear all symbols
4191 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4192 for my $name (keys %$leaf_symtab) {
4193 _gv_clear *{"$pkg$name"};
4194# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4195 }
3554} 4196}
3555 4197
3556sub do_reload_perl() { 4198sub do_reload_perl() {
3557 # can/must only be called in main 4199 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3559 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3560 return; 4202 return;
3561 } 4203 }
3562 4204
3563 warn "reloading..."; 4205 return if $RELOAD++;
3564 4206
3565 warn "entering sync_job"; 4207 my $t1 = AE::time;
3566 4208
4209 while ($RELOAD) {
4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
4212
4213 trace "perl_reload: entering sync_job";
4214
3567 cf::sync_job { 4215 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 4216 #cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark
3571 4217
3572 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV;
3574
3575 # if anything goes wrong in here, we should simply crash as we already saved
3576
3577 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs;
3583 warn "iterate...";
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = (); 4220 %EXT_CORO = ();
3591 4221
3592 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3593 %COMMAND = (); 4223 %COMMAND = ();
3594 4224
3595 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3596 %EXTCMD = (); 4226 %EXTCMD = ();
3597 %EXTICMD = (); 4227 %EXTICMD = ();
3598 4228
3599 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3600 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3602 4232
3603 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3604 eval { 4234 eval {
3605 $cb->($pkg); 4235 $cb->($pkg);
3606 1 4236 1
3607 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
4238 }
4239
4240 trace "... clearing $pkg";
4241 clear_package $pkg;
3608 } 4242 }
3609 4243
3610 warn "... nuking $pkg";
3611 Symbol::delete_package $pkg;
3612 }
3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3615 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 4247
3618 warn "... unloading $k"; 4248 trace "... unloading $k";
3619 delete $INC{$k}; 4249 delete $INC{$k};
3620 4250
3621 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3623 4253
3624 if (my $cb = $k->can ("unload_module")) { 4254 if (my $cb = $k->can ("unload_module")) {
3625 $cb->(); 4255 $cb->();
4256 }
4257
4258 clear_package $k;
3626 } 4259 }
3627 4260
3628 Symbol::delete_package $k;
3629 }
3630
3631 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 4262 clear_package "safe::$_"
3633 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3634 4264
3635 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3638 4268
3639 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3640 # and global variables created in xs 4270 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3642 4272
3643 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3644 4274
3645 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3646 require cf; 4276 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3648 4278
3649 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3650 cf::reload_config; 4280 cf::reload_config;
3651 4281
3652 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3653 cf::load_extensions; 4283 cf::load_extensions;
3654 4284
4285 if ($REATTACH_ON_RELOAD) {
3655 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3658 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
4292 }
3661 4293
3662 warn "leaving sync_job"; 4294 cf::_post_init 1;
3663 4295
4296 trace "perl_reload: leaving sync_job";
4297
3664 1 4298 1
3665 } or do { 4299 } or do {
3666 warn $@; 4300 error $@;
3667 cf::cleanup "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
4302 };
4303
4304 --$RELOAD;
3668 }; 4305 }
3669 4306
3670 warn "reloaded"; 4307 $t1 = AE::time - $t1;
4308 info "perl_reload: completed in ${t1}s\n";
3671}; 4309};
3672 4310
3673our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3674 4312
3675sub reload_perl() { 4313sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 4314 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3678 4316
4317 $RELOAD_WATCHER ||= cf::async {
4318 Coro::AIO::aio_wait cache_extensions;
4319
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 4321 do_reload_perl;
3681 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
4323 };
3682 }; 4324 };
3683} 4325}
3684 4326
3685register_command "reload" => sub { 4327register_command "reload" => sub {
3686 my ($who, $arg) = @_; 4328 my ($who, $arg) = @_;
3692 reload_perl; 4334 reload_perl;
3693 }; 4335 };
3694 } 4336 }
3695}; 4337};
3696 4338
3697unshift @INC, $LIBDIR; 4339#############################################################################
3698 4340
3699my $bug_warning = 0; 4341my $bug_warning = 0;
3700 4342
3701our @WAIT_FOR_TICK;
3702our @WAIT_FOR_TICK_BEGIN;
3703
3704sub wait_for_tick { 4343sub wait_for_tick() {
3705 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3706 4345
3707 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3708 push @WAIT_FOR_TICK, $signal;
3709 $signal->wait;
3710} 4347}
3711 4348
3712sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3714 4351
3715 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3717 $signal->wait; 4354 $signal->wait;
3718} 4355}
3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3723 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3724 return; 4361 return;
3725 } 4362 }
3726 4363
3727 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4365
4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3728 4367
3729 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3731 Coro::async_pool { 4370 Coro::async_pool {
3732 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3733 write_runtime_sync 4372 write_runtime_sync
3734 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3735 }; 4374 };
3736 } 4375 }
3737 4376
3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3739 $sig->send; 4378 $sig->send;
3740 } 4379 }
3741 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3742 $sig->send;
3743 }
3744 4381
3745 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3747 4384
3748 if (0) { 4385 if (0) {
3749 if ($NEXT_TICK) { 4386 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK; 4387 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d# 4389 debug "jitter $JITTER\n";#d#
3753 } 4390 }
3754 } 4391 }
3755} 4392}
3756 4393
3757{ 4394{
3758 # configure BDB 4395 # configure BDB
4396 info "initialising database";
3759 4397
3760 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3761 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3763 4401
3764 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4406 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4407 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4408 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 4409
3771 cf::sync_job { 4410 cf::sync_job {
3772 eval { 4411 eval {
3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3792 }; 4431 };
3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3795 }; 4434 };
4435
4436 info "database initialised";
3796} 4437}
3797 4438
3798{ 4439{
3799 # configure IO::AIO 4440 # configure IO::AIO
3800 4441
4442 info "initialising aio";
3801 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
3804} 4447}
3805 4448
3806my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3807 4451
3808sub _log_backtrace { 4452sub _log_backtrace {
3809 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3810 4454
3811 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3812 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3813 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3815 ++$_log_backtrace; 4463 ++$_log_backtrace;
4464 my $perl_bt = Carp::longmess $msg;
3816 async { 4465 async {
3817 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3818 4467
3819 my @bt = fork_call { 4468 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 4469 @addr = map { sprintf "%x", $_ } @addr;
3831 } 4480 }
3832 4481
3833 @funcs 4482 @funcs
3834 }; 4483 };
3835 4484
3836 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $perl_bt\n";
4486 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 4488 --$_log_backtrace;
3839 }; 4489 };
3840 } else { 4490 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3842 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3843 } 4493 }
3844} 4494}
3845 4495
3846# load additional modules 4496# load additional modules
3847use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3848 4499
3849END { cf::emergency_save } 4500END { cf::emergency_save }
3850 4501
38511 45021
3852 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines