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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines