ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6#
7# Deliantra is free software: you can redistribute it and/or modify it under
8# the terms of the Affero GNU General Public License as published by the
9# Free Software Foundation, either version 3 of the License, or (at your
10# option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU General Public License for more details.
16#
17# You should have received a copy of the Affero GNU General Public License
18# and the GNU General Public License along with this program. If not, see
19# <http://www.gnu.org/licenses/>.
20#
21# The authors can be reached via e-mail to <support@deliantra.net>
22#
23
1package cf; 24package cf;
2 25
3use utf8; 26use common::sense;
4use strict;
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
36use Carp ();
14 37
38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
15use Coro 4.32 (); 42use Coro ();
16use Coro::State; 43use Coro::State;
17use Coro::Handle; 44use Coro::Handle;
18use Coro::EV; 45use Coro::EV;
46use Coro::AnyEvent;
19use Coro::Timer; 47use Coro::Timer;
20use Coro::Signal; 48use Coro::Signal;
21use Coro::Semaphore; 49use Coro::Semaphore;
50use Coro::SemaphoreSet;
51use Coro::AnyEvent;
22use Coro::AIO; 52use Coro::AIO;
23use Coro::BDB; 53use Coro::BDB 1.6;
24use Coro::Storable; 54use Coro::Storable;
25use Coro::Util (); 55use Coro::Util ();
26 56
57use Guard ();
27use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
28use BDB (); 59use BDB ();
29use Data::Dumper; 60use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 61use Fcntl;
32use YAML (); 62use YAML::XS ();
63use CBOR::XS ();
33use IO::AIO 2.51 (); 64use IO::AIO ();
34use Time::HiRes;
35use Compress::LZF; 65use Compress::LZF;
36use Digest::MD5 (); 66use Digest::MD5 ();
67
68AnyEvent::detect;
37 69
38# configure various modules to our taste 70# configure various modules to our taste
39# 71#
40$Storable::canonical = 1; # reduce rsync transfers 72$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 80
44$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" };
45 83
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 84sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
85
86our @ORIG_INC;
47 87
48our %COMMAND = (); 88our %COMMAND = ();
49our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
50 90
51our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
53our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
56 98
57our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 100our @EVENT;
101our @REFLECT; # set by XS
102our %REFLECT; # set by us
59 103
60our $CONFDIR = confdir; 104our $CONFDIR = confdir;
105
61our $DATADIR = datadir; 106our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 107our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 108our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 109our $MAPDIR = "$DATADIR/" . mapdir;
110
65our $LOCALDIR = localdir; 111our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 112our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 113our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 114our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 115our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 116our $BDBDIR = "$LOCALDIR/db";
71our %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;
72 127
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 128our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 129our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 130our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 131our $USE_FSYNC = 1; # use fsync to write maps - default on
79 132
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 133our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 134our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 135our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 136our $DB_ENV;
85 137
138our @EXTRA_MODULES = qw(pod match mapscript incloader);
139
86our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
87 142
88our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 144our $RUNTIME = 0;
145our $SERVER_TICK = 0;
90our $NOW; 146our $NOW;
91 147
92our (%PLAYER, %PLAYER_LOADING); # all users 148our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 149our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 150our $LINK_MAP; # the special {link} map, which is always available
96# used to convert map paths into valid unix filenames by replacing / by ∕ 152# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 153our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 154
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 155our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 156our $LOADAVG; # same thing, but with alpha-smoothing
157our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 158our $TICK_START; # for load detecting purposes
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;
102 167
103binmode STDOUT; 168binmode STDOUT;
104binmode STDERR; 169binmode STDERR;
105 170
106# read virtual server time, if available 171# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 172unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 173 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 174 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 175 $RUNTIME = <$fh> + 0.;
111} 176}
177
178eval "sub TICK() { $TICK } 1" or die;
112 179
113mkdir $_ 180mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 181 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 182
116our $EMERGENCY_POSITION; 183our $EMERGENCY_POSITION;
117 184
118sub cf::map::normalise; 185sub cf::map::normalise;
119 186
187sub in_main() {
188 $Coro::current == $Coro::main
189}
190
120############################################################################# 191#############################################################################
121 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
122=head2 GLOBAL VARIABLES 204=head2 GLOBAL VARIABLES
123 205
124=over 4 206=over 4
125 207
126=item $cf::UPTIME 208=item $cf::UPTIME
127 209
128The 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.
129 226
130=item $cf::RUNTIME 227=item $cf::RUNTIME
131 228
132The 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
133every server tick. 230every server tick.
134 231
135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
138 235
139Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
142database environment. 239database environment.
143 240
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 241=item $cf::LOADAVG
153 242
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
164Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 254from wherever your confdir points to.
166 255
167=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
168 257
169These 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.
170returns 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
171per 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();
172 279
173=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
174 281
175This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 283C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 284that call.
178 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
179=back 292=back
180 293
181=cut 294=cut
182 295
183BEGIN { 296sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 303 my $msg = join "", @_;
186 304
187 $msg .= "\n" 305 $msg .= "\n"
188 unless $msg =~ /\n$/; 306 unless $msg =~ /\n$/;
189 307
190 $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;
191 309
192 LOG llevError, $msg; 310 LOG llevWarn, $msg;
193 }; 311};
194}
195 312
196$Coro::State::DIEHOOK = sub { 313$Coro::State::DIEHOOK = sub {
314 return unless $^S eq 0; # "eq", not "=="
315
197 warn Carp::longmess $_[0]; 316 error Carp::longmess $_[0];
317
318 if (in_main) {#d#
319 error "DIEHOOK called in main context, Coro bug?\n";#d#
320 return;#d#
321 }#d#
322
323 # kill coroutine otherwise
198 Coro::terminate; 324 Coro::terminate
199}; 325};
200 326
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 327@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 328@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 329@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 337for my $pkg (qw(
212 cf::global cf::attachable 338 cf::global cf::attachable
213 cf::object cf::object::player 339 cf::object cf::object::player
214 cf::client cf::player 340 cf::client cf::player
215 cf::arch cf::living 341 cf::arch cf::living
342 cf::map cf::mapspace
216 cf::map cf::party cf::region 343 cf::party cf::region
217)) { 344)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 346}
221 347
222$EV::DIED = sub { 348$EV::DIED = sub {
223 warn "error in event callback: @_"; 349 warn "error in event callback: $@";
224}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
225 356
226############################################################################# 357#############################################################################
227 358
228=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
229 360
250 $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;
251 $d 382 $d
252 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
253} 384}
254 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
255=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
256 439
257Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
258 441
259=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
265our $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
266 449
267sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
269 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
270=item cf::lock_wait $string 529=item cf::lock_wait $string
271 530
272Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
273 532
274=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
275 534
276Wait 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
277a 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,
278for example when the coroutine gets canceled), the lock is automatically 537for example when the coroutine gets canceled), the lock is automatically
279returned. 538returned.
280 539
281Locks 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
282deadlocked coro. 541deadlocked coro.
288 547
289Return 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.
290 549
291=cut 550=cut
292 551
293our %LOCK; 552our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 553
296sub lock_wait($) { 554sub lock_wait($) {
297 my ($key) = @_; 555 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 556}
310 557
311sub lock_acquire($) { 558sub lock_acquire($) {
312 my ($key) = @_; 559 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 560}
326 561
327sub lock_active($) { 562sub lock_active($) {
328 my ($key) = @_; 563 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 564}
332 565
333sub freeze_mainloop { 566sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 567 tick_inhibit_inc;
335 568
336 my $guard = Coro::guard { 569 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 570}
342 571
343=item cf::periodic $interval, $cb 572=item cf::periodic $interval, $cb
344 573
345Like 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
346get spread over timer. 575get spread over time.
347 576
348=cut 577=cut
349 578
350sub periodic($$) { 579sub periodic($$) {
351 my ($interval, $cb) = @_; 580 my ($interval, $cb) = @_;
355 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
356} 585}
357 586
358=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
359 588
360Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
361This 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
362of 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.
363 596
364The 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
365used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
366 599
367Useful for short background jobs. 600Useful for short background jobs.
368 601
369=cut 602=cut
370 603
371our @SLOT_QUEUE; 604our @SLOT_QUEUE;
372our $SLOT_QUEUE; 605our $SLOT_QUEUE;
606our $SLOT_DECAY = 0.9;
373 607
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 608$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 609$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 610 $Coro::current->desc ("timeslot manager");
377 611
378 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
613 my $busy;
379 614
380 while () { 615 while () {
381 next_job: 616 next_job:
617
618 Coro::cede;
619
382 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 621
384 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
624 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 626 $job->[2]->send;
388 Coro::cede;
389 goto next_job; 627 goto next_job;
390 } 628 } else {
629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 630 }
392 } 631 }
393 632
394 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
396 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait;
398 } else { 635 } else {
636 $busy = 0;
399 Coro::schedule; 637 Coro::schedule;
400 } 638 }
401 } 639 }
402}; 640};
403 641
404sub get_slot($;$$) { 642sub get_slot($;$$) {
643 return if tick_inhibit || $Coro::current == $Coro::main;
644
405 my ($time, $pri, $name) = @_; 645 my ($time, $pri, $name) = @_;
406 646
407 $time = $TICK * .6 if $time > $TICK * .6; 647 $time = clamp $time, 0.01, $TICK * .6;
648
408 my $sig = new Coro::Signal; 649 my $sig = new Coro::Signal;
409 650
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 651 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 652 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 653 $SLOT_QUEUE->ready;
424BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
425 666
426=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
427 668
428The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
429is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
430partly 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
431acceptable. 672acceptable.
432 673
433If 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
434the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
438=cut 679=cut
439 680
440sub sync_job(&) { 681sub sync_job(&) {
441 my ($job) = @_; 682 my ($job) = @_;
442 683
443 if ($Coro::current == $Coro::main) { 684 if (in_main) {
444 my $time = EV::time; 685 my $time = AE::time;
445 686
446 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
448 689
449 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
450 691
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
454 693
455 my $busy = 1; 694 my $busy = 1;
456 my @res; 695 my @res;
457 696
458 (async { 697 (async {
459 $Coro::current->desc ("sync job coro"); 698 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 699 @res = eval { $job->() };
461 warn $@ if $@; 700 error $@ if $@;
462 undef $busy; 701 undef $busy;
463 })->prio (Coro::PRIO_MAX); 702 })->prio (Coro::PRIO_MAX);
464 703
465 while ($busy) { 704 while ($busy) {
466 if (Coro::nready) { 705 if (Coro::nready) {
467 Coro::cede_notself; 706 Coro::cede_notself;
468 } else { 707 } else {
469 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
470 } 709 }
471 } 710 }
472 711
473 $time = EV::time - $time; 712 my $time = AE::time - $time;
474 713
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 714 $TICK_START += $time; # do not account sync jobs to server load
479 715
480 wantarray ? @res : $res[0] 716 wantarray ? @res : $res[0]
481 } else { 717 } else {
482 # we are in another coroutine, how wonderful, everything just works 718 # we are in another coroutine, how wonderful, everything just works
483 719
503 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
504 740
505 $coro 741 $coro
506} 742}
507 743
508=item fork_call { }, $args 744=item fork_call { }, @args
509 745
510Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 749never block itself or use any form of event handling.
514 750
515=cut 751=cut
516 752
753sub post_fork {
754 reset_signals;
755}
756
517sub fork_call(&@) { 757sub fork_call(&@) {
518 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
519 759
520 # we seemingly have to make a local copy of the whole thing,
521 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious)
523
524 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
525 reset_signals; 761 cf::post_fork;
526 &$cb 762 &$cb
527 }, @args; 763 } @args;
528 764
529 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 )
777}
778
779=item $coin = coin_from_name $name
780
781=cut
782
783our %coin_alias = (
784 "silver" => "silvercoin",
785 "silvercoin" => "silvercoin",
786 "silvercoins" => "silvercoin",
787 "gold" => "goldcoin",
788 "goldcoin" => "goldcoin",
789 "goldcoins" => "goldcoin",
790 "platinum" => "platinacoin",
791 "platinumcoin" => "platinacoin",
792 "platinumcoins" => "platinacoin",
793 "platina" => "platinacoin",
794 "platinacoin" => "platinacoin",
795 "platinacoins" => "platinacoin",
796 "royalty" => "royalty",
797 "royalties" => "royalty",
798);
799
800sub coin_from_name($) {
801 $coin_alias{$_[0]}
802 ? cf::arch::find $coin_alias{$_[0]}
803 : undef
530} 804}
531 805
532=item $value = cf::db_get $family => $key 806=item $value = cf::db_get $family => $key
533 807
534Returns a single value from the environment database. 808Returns a single value from the environment database.
544within each server. 818within each server.
545 819
546=cut 820=cut
547 821
548sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
549 my ($name) = @_; 826 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
551 828
552 eval { 829 eval {
553 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
563} 840}
564 841
565our $DB; 842our $DB;
566 843
567sub db_init { 844sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
570 };
571} 846}
572 847
573sub db_get($$) { 848sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
575 850
576 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
577 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
578 855
579 $! ? () 856 $! ? ()
580 : $data 857 : $data
581 }
582} 858}
583 859
584sub db_put($$$) { 860sub db_put($$$) {
585 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
614 890
615 my @data; 891 my @data;
616 my $md5; 892 my $md5;
617 893
618 for (0 .. $#$src) { 894 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
620 or Carp::croak "$src->[$_]: $!";
621 } 896 }
622 897
623 # if processing is expensive, check 898 # if processing is expensive, check
624 # checksum first 899 # checksum first
625 if (1) { 900 if (1) {
638 913
639 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
640 } 915 }
641 } 916 }
642 917
643 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
644 my $data = $process->(\@data); 919 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
646 921
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 923
649 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 926 db_put cache => "$id/meta", $meta;
652 927
662 937
663=cut 938=cut
664 939
665sub datalog($@) { 940sub datalog($@) {
666 my ($type, %kv) = @_; 941 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 942 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 943}
669 944
670=back 945=back
671 946
672=cut 947=cut
673 948
674############################################################################# 949#############################################################################
675 950
676=head2 ATTACHABLE OBJECTS 951=head2 ATTACHABLE OBJECTS
677 952
678Many 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
679attach callbacks/event handlers (a collection of which is called an "attachment") 954attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 955to it. All such attachable objects support the following methods.
681 956
682In 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>
683C<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
733=item cf::CLASS::attachment $name, ... 1008=item cf::CLASS::attachment $name, ...
734 1009
735Register an attachment by C<$name> through which attachable objects of the 1010Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 1011given CLASS can refer to this attachment.
737 1012
738Some classes such as crossfire maps and objects can specify attachments 1013Some classes such as deliantra maps and objects can specify attachments
739that 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.
740 1015
741These calls expect any number of the following handler/hook descriptions: 1016These calls expect any number of the following handler/hook descriptions:
742 1017
743=over 4 1018=over 4
867 1142
868 } elsif (exists $cb_id{$type}) { 1143 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1144 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 1145
871 } elsif (ref $type) { 1146 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 1147 error "attaching objects not supported, ignoring.\n";
873 1148
874 } else { 1149 } else {
875 shift @arg; 1150 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1151 error "attach argument '$type' not supported, ignoring.\n";
877 } 1152 }
878 } 1153 }
879} 1154}
880 1155
881sub _object_attach { 1156sub _object_attach {
891 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
892 } 1167 }
893 1168
894 $obj->{$name} = \%arg; 1169 $obj->{$name} = \%arg;
895 } else { 1170 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1171 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1172 }
898 1173
899 $obj->{_attachment}{$name} = undef; 1174 $obj->{_attachment}{$name} = undef;
900} 1175}
901 1176
960 1235
961 for (@$callbacks) { 1236 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1237 eval { &{$_->[1]} };
963 1238
964 if ($@) { 1239 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1240 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1241 override;
968 } 1242 }
969 1243
970 return 1 if $override; 1244 return 1 if $override;
971 } 1245 }
1034 1308
1035sub reattach { 1309sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1310 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1311 my ($obj) = @_;
1038 1312
1313 # no longer needed after getting rid of delete_package?
1039 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
1040 1315
1041 my $registry = $obj->registry; 1316 my $registry = $obj->registry;
1042 1317
1043 @$registry = (); 1318 @$registry = ();
1044 1319
1049 for (@$attach) { 1324 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1325 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1326 _attach $registry, $klass, @attach;
1052 } 1327 }
1053 } else { 1328 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1329 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1330 }
1056 } 1331 }
1057} 1332}
1058 1333
1059cf::attachable->attach ( 1334cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1361 my ($filename, $rdata, $objs) = @_;
1087 1362
1088 sync_job { 1363 sync_job {
1089 if (length $$rdata) { 1364 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1365 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1366 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1367 $decname, length $$rdata, scalar @$objs
1368 if $VERBOSE_IO;
1093 1369
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1370 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1371 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1372 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 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 }
1098 close $fh; 1377 aio_close $fh;
1099 1378
1100 if (@$objs) { 1379 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1381 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1382 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1383 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1388 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1389 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1390 }
1109 } else { 1391 } else {
1110 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1111 } 1393 }
1112 1394
1113 aio_rename "$filename~", $filename; 1395 aio_rename "$filename~", $filename;
1396
1397 $filename =~ s%/[^/]+$%%;
1398 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1399 } else {
1115 warn "FATAL: $filename~: $!\n"; 1400 error "unable to save objects: $filename~: $!\n";
1116 } 1401 }
1117 } else { 1402 } else {
1118 aio_unlink $filename; 1403 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1404 aio_unlink "$filename.pst";
1120 } 1405 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1429 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1430 $av = $st->{objs};
1146 } 1431 }
1147 1432
1148 utf8::decode (my $decname = $filename); 1433 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1434 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1435 $decname, length $data, scalar @{$av || []}
1436 if $VERBOSE_IO;
1151 1437
1152 ($data, $av) 1438 ($data, $av)
1153} 1439}
1154 1440
1155=head2 COMMAND CALLBACKS 1441=head2 COMMAND CALLBACKS
1159=cut 1445=cut
1160 1446
1161############################################################################# 1447#############################################################################
1162# command handling &c 1448# command handling &c
1163 1449
1164=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1165 1451
1166Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1167$name. 1453$name.
1168 1454
1169=cut 1455=cut
1175 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1176 1462
1177 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1178} 1464}
1179 1465
1180=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1181 1467
1182Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1183extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1184received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1185the 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
1186has logged in successfully. 1472has logged in successfully.
1187 1473
1188If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1189called.
1190 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
1191=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1192 1482
1193Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1194exticmd 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
1195are 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
1196is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1197log-in. 1487log-in.
1198 1488
1199If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1200called.
1201 1490
1202=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1203 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
1204sub register_extcmd { 1498sub register_extcmd($$) {
1205 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1206 1500
1207 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1208} 1502}
1209 1503
1210sub register_exticmd { 1504sub register_async_extcmd($$) {
1211 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1212 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1213 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1214} 1514}
1215 1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1520}
1521
1522use File::Glob ();
1523
1216cf::player->attach ( 1524cf::player->attach (
1217 on_command => sub { 1525 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1526 my ($pl, $name, $params) = @_;
1219 1527
1220 my $cb = $COMMAND{$name} 1528 my $cb = $COMMAND{$name}
1221 or return; 1529 or return;
1222 1530
1230 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1231 1539
1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1233 1541
1234 if (ref $msg) { 1542 if (ref $msg) {
1235 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1236 "ARRAY" eq ref $msg
1237 ? @$msg
1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1239 1544
1240 my @reply;
1241
1242 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}) {
1243 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1244 } 1563 }
1245 1564
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1249 } else { 1565 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1567 }
1252 1568
1253 cf::override; 1569 cf::override;
1254 }, 1570 },
1255); 1571);
1256 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
1257sub load_extensions { 1597sub load_extensions {
1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1601
1258 cf::sync_job { 1602 cf::sync_job {
1259 my %todo; 1603 my %todo;
1260 1604
1261 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1606 next unless -r $path;
1280 1624
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1627
1284 $ext{source} = 1628 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1287 . $source 1631 . $source
1288 . "\n};\n1"; 1632 . "\n};\n1";
1289 1633
1290 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1291 } 1635 }
1292 1636
1637 my $pass = 0;
1293 my %done; 1638 my %done;
1294 while (%todo) { 1639 while (%todo) {
1295 my $progress; 1640 my $progress;
1296 1641
1642 ++$pass;
1643
1644 ext:
1297 while (my ($k, $v) = each %todo) { 1645 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1646 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1647 next ext
1300 unless exists $done{$_}; 1648 unless exists $done{$_};
1301 } 1649 }
1302 1650
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1652
1305 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 $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1665 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1666
1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1668 if exists $v->{meta}{mandatory};
1310 warn $msg; 1669
1311 warn "mandatory extension failed to load, exiting.\n"; 1670 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1671 delete $todo{$k};
1313 } 1672 } else {
1314 1673 $done{$k} = delete $todo{$k};
1315 warn $msg; 1674 push @EXTS, $v->{pkg};
1675 $progress = 1;
1676
1677 info "$v->{base}: extension inactive.\n"
1678 unless $active;
1316 } 1679 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1680 }
1322 1681
1323 skip: 1682 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1683 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 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 }
1326 } 1692 }
1327 }; 1693 };
1328} 1694}
1329 1695
1330############################################################################# 1696#############################################################################
1331 1697
1332=back 1698=back
1333 1699
1334=head2 CORE EXTENSIONS 1700=head2 CORE EXTENSIONS
1335 1701
1336Functions and methods that extend core crossfire objects. 1702Functions and methods that extend core deliantra objects.
1337 1703
1338=cut 1704=cut
1339 1705
1340package cf::player; 1706package cf::player;
1341 1707
1384 1750
1385sub exists($) { 1751sub exists($) {
1386 my ($login) = @_; 1752 my ($login) = @_;
1387 1753
1388 $cf::PLAYER{$login} 1754 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1755 or !aio_stat path $login
1390} 1756}
1391 1757
1392sub find($) { 1758sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1759 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1760 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1772 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1773 or return;
1408 1774
1409 my $pl = cf::player::load_pl $f 1775 my $pl = cf::player::load_pl $f
1410 or return; 1776 or return;
1777
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1778 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1779 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1780 $cf::PLAYER{$login} = $pl
1414 } 1781 }
1415 } 1782 }
1416} 1783}
1417 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
1418sub save($) { 1798sub save($) {
1419 my ($pl) = @_; 1799 my ($pl) = @_;
1420 1800
1421 return if $pl->{deny_save}; 1801 return if $pl->{deny_save};
1422 1802
1425 1805
1426 return if $pl->{deny_save}; 1806 return if $pl->{deny_save};
1427 1807
1428 aio_mkdir playerdir $pl, 0770; 1808 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1809 $pl->{last_save} = $cf::RUNTIME;
1810
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];
1430 1815
1431 $pl->save_pl ($path); 1816 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1817 cf::cede_to_tick;
1433} 1818}
1434 1819
1466 my ($pl) = @_; 1851 my ($pl) = @_;
1467 1852
1468 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1469 1854
1470 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1471 $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
1472 1857
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1474 $pl->deactivate; 1859 $pl->deactivate;
1860
1861 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1476 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1477 1866
1478 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1480 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1518 1907
1519 for my $login (@$dirs) { 1908 for my $login (@$dirs) {
1520 my $path = path $login; 1909 my $path = path $login;
1521 1910
1522 # a .pst is a dead give-away for a valid player 1911 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1912 # if no pst file found, open and chekc for blocked users
1913 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1914 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1915 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1916 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1917 }
1528 1918
1532 1922
1533 \@logins 1923 \@logins
1534} 1924}
1535 1925
1536=item $player->maps 1926=item $player->maps
1927
1928=item cf::player::maps $login
1537 1929
1538Returns an arrayref of map paths that are private for this 1930Returns an arrayref of map paths that are private for this
1539player. May block. 1931player. May block.
1540 1932
1541=cut 1933=cut
1559 } 1951 }
1560 1952
1561 \@paths 1953 \@paths
1562} 1954}
1563 1955
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1957
1566Expand crossfire pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1657=item $player->ext_reply ($msgid, @msg)
1658
1659Sends an ext reply to the player.
1660
1661=cut
1662
1663sub ext_reply($$@) {
1664 my ($self, $id, @msg) = @_;
1665
1666 $self->ns->ext_reply ($id, @msg)
1667}
1668 1959
1669=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1670 1961
1671Sends an ext event to the client. 1962Sends an ext event to the client.
1672 1963
1692 1983
1693=cut 1984=cut
1694 1985
1695sub find_by_path($) { 1986sub find_by_path($) {
1696 my ($path) = @_; 1987 my ($path) = @_;
1988
1989 $path =~ s/^~[^\/]*//; # skip ~login
1697 1990
1698 my ($match, $specificity); 1991 my ($match, $specificity);
1699 1992
1700 for my $region (list) { 1993 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1994 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 2020our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 2021our $DEFAULT_RESET = 3000;
1729 2022
1730sub generate_random_map { 2023sub generate_random_map {
1731 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1732 # mit "rum" bekleckern, nicht 2025
2026 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2027
1733 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 2029}
1747 2030
1748=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1749 2032
1750Register 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
1755 2038
1756sub register { 2039sub register {
1757 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 2041 my $pkg = caller;
1759 2042
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 2044
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 2046}
1765 2047
1766# also paths starting with '/' 2048# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2049$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 2050
1769sub thawer_merge { 2051sub thawer_merge {
1770 my ($self, $merge) = @_; 2052 my ($self, $merge) = @_;
1771 2053
1772 # we have to keep some variables in memory intact 2054 # we have to keep some variables in memory intact
1777} 2059}
1778 2060
1779sub normalise { 2061sub normalise {
1780 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1781 2063
1782 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1783 2065
1784 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1785 2067
1786 # map plan: 2068 # map plan:
1787 # 2069 #
1802 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 2085 $path = "$base/$path";
1804 } 2086 }
1805 2087
1806 for ($path) { 2088 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1810 } 2091 }
1811 2092
1812 $path 2093 $path
1826 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1827 return $self; 2108 return $self;
1828 } 2109 }
1829 } 2110 }
1830 2111
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2113 ()
1833} 2114}
1834 2115
2116# may re-bless or do other evil things
1835sub init { 2117sub init {
1836 my ($self) = @_; 2118 my ($self) = @_;
1837 2119
1838 $self 2120 $self
1839} 2121}
1858 2140
1859# the temporary/swap location 2141# the temporary/swap location
1860sub save_path { 2142sub save_path {
1861 my ($self) = @_; 2143 my ($self) = @_;
1862 2144
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2145 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 2146 "$TMPDIR/$path.map"
1865} 2147}
1866 2148
1867# the unique path, undef == no special unique path 2149# the unique path, undef == no special unique path
1868sub uniq_path { 2150sub uniq_path {
1869 my ($self) = @_; 2151 my ($self) = @_;
1870 2152
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2153 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2154 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 2155}
1883 2156
1884sub decay_objects { 2157sub decay_objects {
1885 my ($self) = @_; 2158 my ($self) = @_;
1886 2159
1913 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1914 2187
1915 1 2188 1
1916} 2189}
1917 2190
2191# used to laod the header of an original map
1918sub load_header_orig { 2192sub load_header_orig {
1919 my ($self) = @_; 2193 my ($self) = @_;
1920 2194
1921 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
1922} 2196}
1923 2197
2198# used to laod the header of an instantiated map
1924sub load_header_temp { 2199sub load_header_temp {
1925 my ($self) = @_; 2200 my ($self) = @_;
1926 2201
1927 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
1928} 2203}
1929 2204
2205# called after loading the header from an instantiated map
1930sub prepare_temp { 2206sub prepare_temp {
1931 my ($self) = @_; 2207 my ($self) = @_;
1932 2208
1933 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
1935 # safety 2211 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2214}
1939 2215
2216# called after loading the header from an original map
1940sub prepare_orig { 2217sub prepare_orig {
1941 my ($self) = @_; 2218 my ($self) = @_;
1942 2219
1943 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
1968 2245
1969sub find; 2246sub find;
1970sub find { 2247sub find {
1971 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
1972 2249
2250 cf::cede_to_tick;
2251
1973 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
1974 2253
1975 cf::lock_wait "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2256
1978 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2258 my $map = new_from_path cf::map $path
1983 or return; 2259 or return;
1984 2260
1985 $map->{last_save} = $cf::RUNTIME; 2261 $map->{last_save} = $cf::RUNTIME;
1986 2262
1988 or return; 2264 or return;
1989 2265
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2266 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2267 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2268 #$cf::WAIT_FOR_TICK->wait;
2269 undef $guard2;
1993 undef $guard1; 2270 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2271 $map->reset;
1996 return find $path; 2272 return find $path;
1997 } 2273 }
1998 2274
1999 $cf::MAP{$path} = $map 2275 $cf::MAP{$path} = $map
2000 } 2276 }
2001} 2277}
2002 2278
2003sub pre_load { } 2279sub pre_load { }
2004sub post_load { } 2280#sub post_load { } # XS
2005 2281
2006sub load { 2282sub load {
2007 my ($self) = @_; 2283 my ($self) = @_;
2008 2284
2009 local $self->{deny_reset} = 1; # loading can take a long time 2285 local $self->{deny_reset} = 1; # loading can take a long time
2012 2288
2013 { 2289 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
2015 2291
2016 return unless $self->valid; 2292 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2294
2021 $self->alloc; 2295 $self->alloc;
2022 2296
2023 $self->pre_load; 2297 $self->pre_load;
2024 cf::cede_to_tick; 2298 cf::cede_to_tick;
2025 2299
2300 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2302 $f->skip_block;
2028 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2029 or return; 2304 or return;
2030 2305
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2306 $self->post_load_original
2032 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2033 2308
2034 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2310 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2313 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2041 } 2317 }
2042 } 2318 }
2043 }
2044 2319
2045 $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);
2046 2327
2047 cf::cede_to_tick; 2328 cf::cede_to_tick;
2048 # now do the right thing for maps 2329 # now do the right thing for maps
2049 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2336 $self->decay_objects;
2056 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2057 $self->update_buttons; 2338 $self->update_buttons;
2058 cf::cede_to_tick; 2339 cf::cede_to_tick;
2059 $self->set_darkness_map; 2340 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2341 }
2063 2342
2064 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_IN_MEMORY);
2068 } 2345 }
2069 2346
2070 $self->post_load; 2347 $self->post_load;
2071}
2072 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
2073sub customise_for { 2355sub customise_for {
2074 my ($self, $ob) = @_; 2356 my ($self, $ob) = @_;
2075 2357
2076 return find "~" . $ob->name . "/" . $self->{path} 2358 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2359 if $self->per_player;
2080# if $self->per_party; 2362# if $self->per_party;
2081 2363
2082 $self 2364 $self
2083} 2365}
2084 2366
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2367sub find_sync {
2112 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2113 2369
2114 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
2115} 2375}
2116 2376
2117sub do_load_sync { 2377sub do_load_sync {
2118 my ($map) = @_; 2378 my ($map) = @_;
2119 2379
2380 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2122 2383
2123 cf::sync_job { $map->load }; 2384 $map->load;
2124} 2385}
2125 2386
2126our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2128 2389
2129sub find_async { 2390sub find_async {
2130 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2131 2392
2132 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2133 2394
2134 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2396 return $map if !$load || $map->linkable;
2136 } 2397 }
2137 2398
2138 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2139 2400
2140 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2142 2403
2143 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2144 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2145 if (my $map = find $k) { 2406 if (my $map = find $k) {
2146 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2147 } 2408 }
2148 2409
2149 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2150 } 2411 }
2151 } 2412 }
2154 $MAP_PREFETCHER->prio (6); 2415 $MAP_PREFETCHER->prio (6);
2155 2416
2156 () 2417 ()
2157} 2418}
2158 2419
2420# common code, used by both ->save and ->swapout
2159sub save { 2421sub _save {
2160 my ($self) = @_; 2422 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2423
2164 $self->{last_save} = $cf::RUNTIME; 2424 $self->{last_save} = $cf::RUNTIME;
2165 2425
2166 return unless $self->dirty; 2426 return unless $self->dirty;
2167 2427
2176 2436
2177 cf::async { 2437 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2438 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2439 $_->contr->save for $self->players;
2180 }; 2440 };
2441
2442 cf::get_slot 0.02;
2181 2443
2182 if ($uniq) { 2444 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2445 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2446 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2447 } else {
2186 $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);
2187 } 2449 }
2188} 2450}
2189 2451
2452sub save {
2453 my ($self) = @_;
2454
2455 my $lock = cf::lock_acquire "map_data:$self->{path}";
2456
2457 $self->_save;
2458}
2459
2190sub swap_out { 2460sub swap_out {
2191 my ($self) = @_; 2461 my ($self) = @_;
2192 2462
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2464
2465 return if !$self->linkable;
2466 return if $self->{deny_save};
2198 return if $self->players; 2467 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 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
2200 return if $self->{deny_save}; 2485 return 1e99 if $self->{deny_reset};
2201 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
2202 $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};
2203 2519
2204 $self->deactivate; 2520 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2521 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2522 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2523
2252 $self->unlink_save; 2524 $self->unlink_save;
2253 $self->destroy; 2525 $self->destroy;
2254} 2526}
2255 2527
2263 2535
2264 delete $cf::MAP{$self->path}; 2536 delete $cf::MAP{$self->path};
2265 2537
2266 $self->unlink_save; 2538 $self->unlink_save;
2267 2539
2268 bless $self, "cf::map"; 2540 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2541 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2542 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2543 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2544 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2545
2322 2594
2323sub unique_maps() { 2595sub unique_maps() {
2324 [ 2596 [
2325 map { 2597 map {
2326 utf8::decode $_; 2598 utf8::decode $_;
2327 /\.map$/ 2599 s/\.map$//; # TODO future compatibility hack
2600 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2601 ? ()
2328 ? normalise $_ 2602 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2603 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2604 ]
2332} 2605}
2333 2606
2334package cf; 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}
2335 2638
2336=back 2639=back
2337 2640
2338=head3 cf::object 2641=head3 cf::object
2339 2642
2343 2646
2344=over 4 2647=over 4
2345 2648
2346=item $ob->inv_recursive 2649=item $ob->inv_recursive
2347 2650
2348Returns the inventory of the object _and_ their inventories, recursively. 2651Returns the inventory of the object I<and> their inventories, recursively,
2652but I<not> the object itself.
2349 2653
2350=cut 2654=cut
2351 2655
2352sub inv_recursive_; 2656sub inv_recursive_;
2353sub inv_recursive_ { 2657sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2662 inv_recursive_ inv $_[0]
2359} 2663}
2360 2664
2361=item $ref = $ob->ref 2665=item $ref = $ob->ref
2362 2666
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2364 2668
2365=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2366 2670
2367returns 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,
2368even if the object actually exists. May block. 2672even if the object actually exists. May block.
2369 2673
2370=cut 2674=cut
2371 2675
2372sub deref { 2676sub deref {
2400can 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
2401dialogue with the given NPC character. 2705dialogue with the given NPC character.
2402 2706
2403=cut 2707=cut
2404 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
2405# rough implementation of a future "reply" method that works 2723# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2724# with dialog boxes.
2407#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
2408sub cf::object::player::reply($$$;$) { 2726sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2727 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2738 my $dialog = $pl->{npc_dialog};
2421 $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));
2422 2740
2423 } else { 2741 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2742 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2743 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2744 }
2427 } 2745 }
2428} 2746}
2429 2747
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2748=item $object->send_msg ($channel, $msg, $color, [extra...])
2440=item $player_object->may ("access") 2758=item $player_object->may ("access")
2441 2759
2442Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2443(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2444 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
2445=cut 2788=cut
2446 2789
2447sub cf::object::player::may { 2790sub cf::object::player::may {
2448 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2449 2792
2450 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2451 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2452 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2453 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2454} 2797}
2455 2798
2456=item $player_object->enter_link 2799=item $player_object->enter_link
2457 2800
2458Freezes 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}>).
2459 2802
2460The 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.
2461I<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.
2462 2807
2463Will 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.
2464 2815
2465=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2466 2817
2467Moves 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
2468map. 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
2486sub cf::object::player::enter_link { 2837sub cf::object::player::enter_link {
2487 my ($self) = @_; 2838 my ($self) = @_;
2488 2839
2489 $self->deactivate_recursive; 2840 $self->deactivate_recursive;
2490 2841
2842 ++$self->{_link_recursion};
2843
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2844 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2845
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2846 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2847 if $self->map && $self->map->{path} ne "{link}";
2495 2848
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2849 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2850}
2498 2851
2499sub cf::object::player::leave_link { 2852sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2853 my ($self, $map, $x, $y) = @_;
2501 2854
2518 ($x, $y) = (-1, -1) 2871 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2872 unless (defined $x) && (defined $y);
2520 2873
2521 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2524 2877
2525 $map->load; 2878 $map->load;
2526 $map->load_neighbours;
2527 2879
2528 return unless $self->contr->active; 2880 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2881
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2883 if ($self->enter_map ($map, $x, $y)) {
2533} 2884 # entering was successful
2885 delete $self->{_link_recursion};
2886 # only activate afterwards, to support waiting in hooks
2887 $self->activate_recursive;
2888 }
2534 2889
2890}
2891
2535=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)]])
2536 2893
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2895her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2541be called at the end of this process. 2898be called at the end of this process.
2542 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
2543=cut 2903=cut
2544 2904
2545our $GOTOGEN; 2905our $GOTOGEN;
2546 2906
2547sub cf::object::player::goto { 2907sub cf::object::player::goto {
2548 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 }
2549 2915
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2917 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2918
2553 $self->enter_link; 2919 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2574 } 2940 }
2575 } 2941 }
2576 2942
2577 my $map = eval { 2943 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2945
2580 if ($map) { 2946 if ($map) {
2581 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2949 } else {
2584 $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);
2585 } 2951 }
2586 2952
2587 $map 2953 $map
2595 if ($gen == $self->{_goto_generation}) { 2961 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2962 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2963 $self->leave_link ($map, $x, $y);
2598 } 2964 }
2599 2965
2600 $done->() if $done; 2966 $done->($self) if $done;
2601 })->prio (1); 2967 })->prio (1);
2602} 2968}
2603 2969
2604=item $player_object->enter_exit ($exit_object) 2970=item $player_object->enter_exit ($exit_object)
2605 2971
2625} 2991}
2626 2992
2627sub prepare_random_map { 2993sub prepare_random_map {
2628 my ($exit) = @_; 2994 my ($exit) = @_;
2629 2995
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2996 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2997 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2998 # that depends on the exit object
2635 2999
2636 my $rmp = parse_random_map_params $exit->msg; 3000 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 3002 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 3003 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 3004 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 3005 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 3006 $rmp->{origin_y} = $exit->y;
3007
3008 $exit->map->touch;
2643 } 3009 }
2644 3010
2645 $rmp->{random_seed} ||= $exit->random_seed; 3011 $rmp->{random_seed} ||= $exit->random_seed;
2646 3012
2647 my $data = cf::encode_json $rmp; 3013 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 3014 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 3015 my $meta = "$RANDOMDIR/$md5.meta";
2650 3016
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3017 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 3018 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 3019 undef $fh;
2654 aio_rename "$meta~", $meta; 3020 aio_rename "$meta~", $meta;
2655 3021
3022 my $slaying = "?random/$md5";
3023
3024 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 3025 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 3026 $exit->msg (undef);
3027 }
2658 } 3028 }
2659} 3029}
2660 3030
2661sub cf::object::player::enter_exit { 3031sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 3032 my ($self, $exit) = @_;
2663 3033
2664 return unless $self->type == cf::PLAYER; 3034 return unless $self->type == cf::PLAYER;
2665 3035
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 3036 $self->enter_link;
2678 3037
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 3038 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3039 $Coro::current->{desc} = "enter_exit";
2685 3040
2686 $self->deactivate_recursive; # just to be sure
2687 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
2688 $self->goto ($slaying, $hp, $sp); 3071 $self->goto ($map, $x, $y);
2689 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
2690 1; 3077 1
2691 }) { 3078 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 3079 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "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. "
2694 . "Please report this to the dungeon master!", 3081 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 3082 cf::NDI_UNIQUE | cf::NDI_RED);
2696 3083
2697 warn "ERROR in enter_exit: $@"; 3084 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 3085 $self->leave_link;
2699 } 3086 }
2700 })->prio (1); 3087 })->prio (1);
2701} 3088}
2702 3089
2703=head3 cf::client 3090=head3 cf::client
2704 3091
2705=over 4 3092=over 4
2706 3093
2707=item $client->send_drawinfo ($text, $flags) 3094=item $client->send_big_packet ($pkt)
2708 3095
2709Sends a drawinfo packet to the client. Circumvents output buffering so 3096Like C<send_packet>, but tries to compress large packets, and fragments
2710should not be used under normal circumstances. 3097them as required.
2711 3098
2712=cut 3099=cut
2713 3100
3101our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3102
2714sub cf::client::send_drawinfo { 3103sub cf::client::send_big_packet {
2715 my ($self, $text, $flags) = @_; 3104 my ($self, $pkt) = @_;
2716 3105
2717 utf8::encode $text; 3106 # try lzf for large packets
2718 $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);
2719} 3117}
2720 3118
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 3120
2723Send 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
2724client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2725the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
2726the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2727 3125
2728=cut 3126=cut
2729 3127
2730# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 3129our %CHANNEL = (
3130 "c/motd" => {
3131 id => "infobox",
3132 title => "MOTD",
3133 reply => undef,
3134 tooltip => "The message of the day",
3135 },
2732 "c/identify" => { 3136 "c/identify" => {
2733 id => "infobox", 3137 id => "infobox",
2734 title => "Identify", 3138 title => "Identify",
2735 reply => undef, 3139 reply => undef,
2736 tooltip => "Items recently identified", 3140 tooltip => "Items recently identified",
2738 "c/examine" => { 3142 "c/examine" => {
2739 id => "infobox", 3143 id => "infobox",
2740 title => "Examine", 3144 title => "Examine",
2741 reply => undef, 3145 reply => undef,
2742 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",
2743 }, 3153 },
2744 "c/book" => { 3154 "c/book" => {
2745 id => "infobox", 3155 id => "infobox",
2746 title => "Book", 3156 title => "Book",
2747 reply => undef, 3157 reply => undef,
2761 }, 3171 },
2762 "c/body" => { 3172 "c/body" => {
2763 id => "infobox", 3173 id => "infobox",
2764 title => "Body Parts", 3174 title => "Body Parts",
2765 reply => undef, 3175 reply => undef,
2766 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",
2767 }, 3213 },
2768 "c/uptime" => { 3214 "c/uptime" => {
2769 id => "infobox", 3215 id => "infobox",
2770 title => "Uptime", 3216 title => "Uptime",
2771 reply => undef, 3217 reply => undef,
2775 id => "infobox", 3221 id => "infobox",
2776 title => "Map Info", 3222 title => "Map Info",
2777 reply => undef, 3223 reply => undef,
2778 tooltip => "Information related to the maps", 3224 tooltip => "Information related to the maps",
2779 }, 3225 },
3226 "c/party" => {
3227 id => "party",
3228 title => "Party",
3229 reply => "gsay ",
3230 tooltip => "Messages and chat related to your party",
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,
2780); 3246);
2781 3247
2782sub cf::client::send_msg { 3248sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3249 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3250
2785 $msg = $self->pl->expand_cfpod ($msg); 3251 $msg = $self->pl->expand_cfpod ($msg)
3252 unless $color & cf::NDI_VERBATIM;
2786 3253
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3254 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3255
2789 # check predefined channels, for the benefit of C 3256 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3257 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3258 $channel = $CHANNEL{$channel};
2792 3259
2793 $self->ext_msg (channel_info => $channel) 3260 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3261 $channel = $channel->{id};
2797 3262
2798 } elsif (ref $channel) { 3263 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3264 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3265 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3266 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3267 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3268 }
2805 3269
2806 $channel = $channel->{id}; 3270 $channel = $channel->{id};
2807 } 3271 }
2808 3272
2809 return unless @extra || length $msg; 3273 return unless @extra || length $msg;
2810 3274
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3275 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3276 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3277 if $color & cf::NDI_DEF;
2815 3278
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3279 my $pkt = "msg "
3280 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3281 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3282 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3283
2830 $color &= cf::NDI_COLOR_MASK; 3284 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3285}
2844 3286
2845=item $client->ext_msg ($type, @msg) 3287=item $client->ext_msg ($type, @msg)
2846 3288
2847Sends an ext event to the client. 3289Sends an ext event to the client.
2849=cut 3291=cut
2850 3292
2851sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
2853 3295
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 }
2860}
2861
2862=item $client->ext_reply ($msgid, @msg)
2863
2864Sends an ext reply to the client.
2865
2866=cut
2867
2868sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_;
2870
2871 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 }
2878} 3297}
2879 3298
2880=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
2881 3300
2882Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
2902 3321
2903 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
2904 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
2905 3324
2906 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;
2907} 3365}
2908 3366
2909cf::client->attach ( 3367cf::client->attach (
2910 on_connect => sub { 3368 on_connect => sub {
2911 my ($ns) = @_; 3369 my ($ns) = @_;
2937 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
2938 3396
2939 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2940 3398
2941 if (ref $msg) { 3399 if (ref $msg) {
2942 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2943 "ARRAY" eq ref $msg
2944 ? @$msg
2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2946 3401
2947 my @reply;
2948
2949 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}) {
2950 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
2951 } 3420 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2956 } else { 3421 } else {
2957 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";
2958 } 3423 }
2959 3424
2960 cf::override; 3425 cf::override;
2961 }, 3426 },
2962); 3427);
2982 3447
2983 $coro 3448 $coro
2984} 3449}
2985 3450
2986cf::client->attach ( 3451cf::client->attach (
2987 on_destroy => sub { 3452 on_client_destroy => sub {
2988 my ($ns) = @_; 3453 my ($ns) = @_;
2989 3454
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3455 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3456 },
2992); 3457);
3008our $safe_hole = new Safe::Hole; 3473our $safe_hole = new Safe::Hole;
3009 3474
3010$SIG{FPE} = 'IGNORE'; 3475$SIG{FPE} = 'IGNORE';
3011 3476
3012$safe->permit_only (Opcode::opset qw( 3477$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3478 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3479 grepstart grepwhile mapstart mapwhile
3015 sort time 3480 sort time
3016)); 3481));
3017 3482
3018# here we export the classes and methods available to script code 3483# here we export the classes and methods available to script code
3021 3486
3022The following functions and methods are available within a safe environment: 3487The following functions and methods are available within a safe environment:
3023 3488
3024 cf::object 3489 cf::object
3025 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
3026 insert remove name archname title slaying race decrease_ob_nr 3491 insert remove name archname title slaying race decrease split
3492 value
3027 3493
3028 cf::object::player 3494 cf::object::player
3029 player 3495 player
3030 3496
3031 cf::player 3497 cf::player
3036 3502
3037=cut 3503=cut
3038 3504
3039for ( 3505for (
3040 ["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
3041 insert remove inv name archname title slaying race 3507 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3510 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3046) { 3512) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3515 for @funs;
3051} 3516}
3052 3517
3067 3532
3068 my $qcode = $code; 3533 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3534 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3535 $qcode =~ s/\n/\\n/g;
3071 3536
3537 %vars = (_dummy => 0) unless %vars;
3538
3539 my @res;
3072 local $_; 3540 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3541
3075 my $eval = 3542 my $eval =
3076 "do {\n" 3543 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3544 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3545 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3546 . $code
3080 . "\n}" 3547 . "\n}"
3081 ; 3548 ;
3082 3549
3550 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3551 sub_generation_inc;
3552 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3553 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 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 }
3086 3559
3087 if ($@) { 3560 if ($@) {
3088 warn "$@"; 3561 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3562 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3563 "with arguments " . (join " ", %vars) . "\n";
3091 } 3564 }
3092 3565
3093 wantarray ? @res : $res[0] 3566 wantarray ? @res : $res[0]
3094} 3567}
3095 3568
3109=cut 3582=cut
3110 3583
3111sub register_script_function { 3584sub register_script_function {
3112 my ($fun, $cb) = @_; 3585 my ($fun, $cb) = @_;
3113 3586
3114 no strict 'refs'; 3587 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3588 *$fun = $safe_hole->wrap ($cb);
3116} 3589}
3117 3590
3118=back 3591=back
3119 3592
3120=cut 3593=cut
3121 3594
3122############################################################################# 3595#############################################################################
3123# the server's init and main functions 3596# the server's init and main functions
3124 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
3125sub load_facedata($) { 3675sub load_facedata($) {
3126 my ($path) = @_; 3676 my ($path) = @_;
3127 3677
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3679
3134 warn "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3135 3681
3136 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3137 0 < aio_load $path, $facedata
3138 or die "$path: $!";
3139
3140 $facedata = Coro::Storable::thaw $facedata;
3141 3683
3142 $facedata->{version} == 2 3684 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3144 3686
3145 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3146 $facedata->{resource}{"res/exp_table"} = { 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3147 type => FT_RSRC, 3689
3148 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
3149 }; 3691
3150 cf::cede_to_tick; 3692 # BEGIN ATOMIC
3693 # from here on, everything must be atomic - no thread switch allowed
3694 my $t1 = EV::time;
3151 3695
3152 { 3696 {
3153 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3154 3698
3155 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3702
3158 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3160 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};
3161 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};
3162 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3163 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3164 } 3710 }
3165 3711
3166 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3167 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3168 3714
3171 3717
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3718 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3721 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3723 }
3178
3179 cf::cede_to_tick;
3180 } 3724 }
3181 } 3725 }
3182 3726
3183 { 3727 {
3184 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3185 3729
3186 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3187 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3188 cf::cede_to_tick;
3189 } 3732 }
3190 3733
3191 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3192 } 3735 }
3193 3736
3194 { 3737 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3198 3739
3199 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3200 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
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3744
3204 if ($info->{type} & 1) {
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 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;
3219 } else { 3751 } else {
3220 $RESOURCE{$name} = $info; 3752# $RESOURCE{$name} = $info; # unused
3221 } 3753 }
3222
3223 cf::cede_to_tick;
3224 } 3754 }
3225 } 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;
3226 3766
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3768
3769 aio_close $fh if $fh; # close old facedata
3770
3229 1 3771 1
3230} 3772}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3773
3252register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3775 my ($ns, $want) = @_;
3254 3776
3255 while (my ($k, $v) = each %$want) { 3777 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3778 $ns->fx_want ($k, $v);
3257 } 3779 }
3258}; 3780};
3781
3782sub load_resource_file($) {
3783 my $guard = lock_acquire "load_resource_file";
3784
3785 my $status = load_resource_file_ $_[0];
3786 get_slot 0.1, 100;
3787 cf::arch::commit_load;
3788
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;
3804}
3259 3805
3260sub reload_regions { 3806sub reload_regions {
3261 # 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
3262 # for this (global event?) 3808 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3809 %ext::player_env::MUSIC_FACE_CACHE = ();
3270 if exists $_->{match}; 3816 if exists $_->{match};
3271 } 3817 }
3272} 3818}
3273 3819
3274sub reload_facedata { 3820sub reload_facedata {
3275 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3276 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3277} 3823}
3278 3824
3279sub reload_archetypes { 3825sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references 3828
3283 # this really needs to be done in an extra post-pass 3829 cf::face::set
3284 # (which needs to be synchronous, so solve it differently) 3830 "res/skill_info" => FT_RSRC,
3285 load_resource_file "$DATADIR/archetypes" 3831 JSON::XS->new->utf8->canonical->encode (
3286 or die "unable to load archetypes\n"; 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;
3287} 3854}
3288 3855
3289sub reload_treasures { 3856sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3292} 3859}
3293 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
3294sub reload_resources { 3881sub reload_resources {
3295 warn "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3296 3883
3884 reload_materials;
3885 reload_facedata;
3886 reload_exp_table;
3887 reload_sound;
3888 reload_archetypes;
3297 reload_regions; 3889 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3890 reload_treasures;
3302 3891
3303 warn "finished reloading resource files\n"; 3892 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3893}
3309 3894
3310sub reload_config { 3895sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3896 trace "reloading config file...\n";
3312 or return;
3313 3897
3314 local $/; 3898 my $config = load_file "$CONFDIR/config";
3315 *CFG = YAML::Load <$fh>; 3899 utf8::decode $config;
3900 *CFG = decode_yaml $config;
3316 3901
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3903
3319 $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};
3320 $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};
3321 3906
3322 if (exists $CFG{mlockall}) { 3907 if (exists $CFG{mlockall}) {
3326 }; 3911 };
3327 warn $@ if $@; 3912 warn $@ if $@;
3328 } 3913 }
3329} 3914}
3330 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
3331sub 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
3332 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3334 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#
3335 (async { 3958 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3338 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3339 }; 3962 };
3340 3963
3964 evthread_start IO::AIO::poll_fileno;
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;
3341 reload_config; 3978 reload_config;
3342 db_init; 3979
3980 cf::init_uuid;
3981 cf::init_signals;
3982 cf::init_skills;
3983
3984 cf::init_beforeplay;
3985
3986 atomic;
3987
3343 load_extensions; 3988 load_extensions;
3344 3989
3345 $TICK_WATCHER->start; 3990 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3991
3347 EV::loop; 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;
3997 };
3998
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;
3348} 4007}
3349 4008
3350############################################################################# 4009#############################################################################
3351# initialisation and cleanup 4010# initialisation and cleanup
3352 4011
3353# install some emergency cleanup handlers 4012# install some emergency cleanup handlers
3354BEGIN { 4013BEGIN {
3355 our %SIGWATCHER = (); 4014 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 4015 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4016 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 4017 cf::cleanup "SIG$signal";
3359 }; 4018 };
3360 } 4019 }
3361} 4020}
3362 4021
3363sub write_runtime { 4022sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 4023 my $t0 = AE::time;
3365 4024
3366 # first touch the runtime file to show we are still running: 4025 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 4026 # the fsync below can take a very very long time.
3368 4027
3369 IO::AIO::aio_utime $runtime, undef, undef; 4028 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 4029
3371 my $guard = cf::lock_acquire "write_runtime"; 4030 my $guard = cf::lock_acquire "write_runtime";
3372 4031
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4032 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 4033 or return;
3375 4034
3376 my $value = $cf::RUNTIME + 90 + 10; 4035 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 4036 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 4037 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 4047 aio_utime $fh, undef, undef;
3389 4048
3390 close $fh 4049 close $fh
3391 or return; 4050 or return;
3392 4051
3393 aio_rename "$runtime~", $runtime 4052 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 4053 and return;
3395 4054
3396 warn "runtime file written.\n"; 4055 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 4056
3398 1 4057 1
4058}
4059
4060our $uuid_lock;
4061our $uuid_skip;
4062
4063sub write_uuid_sync($) {
4064 $uuid_skip ||= $_[0];
4065
4066 return if $uuid_lock;
4067 local $uuid_lock = 1;
4068
4069 my $uuid = "$LOCALDIR/uuid";
4070
4071 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4072 or return;
4073
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;
4082 $uuid_skip = 0;
4083
4084 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4085 and return;
4086
4087 # always fsync - this file is important
4088 aio_fsync $fh
4089 and return;
4090
4091 close $fh
4092 or return;
4093
4094 aio_rename "$uuid~", $uuid
4095 and return;
4096
4097 trace "uuid file written ($value).\n";
4098
4099 1
4100
4101}
4102
4103sub write_uuid($$) {
4104 my ($skip, $sync) = @_;
4105
4106 $sync ? write_uuid_sync $skip
4107 : async { write_uuid_sync $skip };
3399} 4108}
3400 4109
3401sub emergency_save() { 4110sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3403 4112
3404 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;
3405 4119
3406 cf::sync_job { 4120 cf::sync_job {
4121 cf::write_runtime_sync; # external watchdog should not bark
4122
3407 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 4127 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 4128 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 4129 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 4131 $pl->save;
3416 } 4132 }
3417 warn "end emergency player save\n"; 4133 info "emergency_perl_save: end player save\n";
3418 4134
3419 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";
3420 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 4140 $map->valid or next;
3423 $map->save; 4141 $map->save;
3424 } 4142 }
3425 warn "end emergency map save\n"; 4143 info "emergency_perl_save: end map save\n";
3426 4144
3427 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";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
4150
4151 info "emergency_perl_save: begin write uuid\n";
4152 write_uuid_sync 1;
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
3430 }; 4173 };
3431 4174
3432 warn "leave emergency perl save\n"; 4175 info "emergency_perl_save: leave\n";
3433} 4176}
3434 4177
3435sub post_cleanup { 4178sub post_cleanup {
3436 my ($make_core) = @_; 4179 my ($make_core) = @_;
3437 4180
4181 IO::AIO::flush;
4182
3438 warn Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3439 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 }
3440} 4213}
3441 4214
3442sub do_reload_perl() { 4215sub do_reload_perl() {
3443 # can/must only be called in main 4216 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 4217 unless (in_main) {
3445 warn "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3446 return; 4219 return;
3447 } 4220 }
3448 4221
3449 warn "reloading..."; 4222 return if $RELOAD++;
3450 4223
3451 warn "entering sync_job"; 4224 my $t1 = AE::time;
3452 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
3453 cf::sync_job { 4232 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 4233 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 4234
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 4237 %EXT_CORO = ();
3477 4238
3478 warn "removing commands"; 4239 trace "perl_reload: removing commands";
3479 %COMMAND = (); 4240 %COMMAND = ();
3480 4241
3481 warn "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3482 %EXTCMD = (); 4243 %EXTCMD = ();
3483 %EXTICMD = (); 4244 %EXTICMD = ();
3484 4245
3485 warn "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 4248 trace "... unloading $pkg";
3488 4249
3489 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3490 eval { 4251 eval {
3491 $cb->($pkg); 4252 $cb->($pkg);
3492 1 4253 1
3493 } 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;
3494 } 4259 }
3495 4260
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 4264
3504 warn "... unloading $k"; 4265 trace "... unloading $k";
3505 delete $INC{$k}; 4266 delete $INC{$k};
3506 4267
3507 $k =~ s/\.pm$//; 4268 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 4269 $k =~ s/\//::/g;
3509 4270
3510 if (my $cb = $k->can ("unload_module")) { 4271 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 4272 $cb->();
4273 }
4274
4275 clear_package $k;
3512 } 4276 }
3513 4277
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 4279 clear_package "safe::$_"
3519 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);
3520 4281
3521 warn "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 4285
3525 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3526 # and global variables created in xs 4287 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3528 4289
3529 warn "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3530 4291
3531 warn "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3532 require cf; 4293 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4294 cf::_connect_to_perl_1;
3534 4295
3535 warn "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3536 cf::reload_config; 4297 cf::reload_config;
3537 4298
3538 warn "loading extensions"; 4299 trace "perl_reload: loading extensions";
3539 cf::load_extensions; 4300 cf::load_extensions;
3540 4301
4302 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3544 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
4309 }
3547 4310
3548 warn "leaving sync_job"; 4311 cf::_post_init 1;
3549 4312
4313 trace "perl_reload: leaving sync_job";
4314
3550 1 4315 1
3551 } or do { 4316 } or do {
3552 warn $@; 4317 error $@;
3553 warn "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3554 exit 1; 4319 };
4320
4321 --$RELOAD;
3555 }; 4322 }
3556 4323
3557 warn "reloaded"; 4324 $t1 = AE::time - $t1;
4325 info "perl_reload: completed in ${t1}s\n";
3558}; 4326};
3559 4327
3560our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3561 4329
3562sub reload_perl() { 4330sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4331 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4332 # coro crashes during coro_state_free->destroy here.
3565 4333
4334 $RELOAD_WATCHER ||= cf::async {
4335 Coro::AIO::aio_wait cache_extensions;
4336
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4337 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4338 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4339 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4340 };
3569 }; 4341 };
3570} 4342}
3571 4343
3572register_command "reload" => sub { 4344register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4345 my ($who, $arg) = @_;
3579 reload_perl; 4351 reload_perl;
3580 }; 4352 };
3581 } 4353 }
3582}; 4354};
3583 4355
3584unshift @INC, $LIBDIR; 4356#############################################################################
3585 4357
3586my $bug_warning = 0; 4358my $bug_warning = 0;
3587 4359
3588our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN;
3590
3591sub wait_for_tick { 4360sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3593 return if $Coro::current == $Coro::main;
3594 4362
3595 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3596 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait;
3598} 4364}
3599 4365
3600sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3602 return if $Coro::current == $Coro::main;
3603 4368
3604 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4371 $signal->wait;
3607} 4372}
3608 4373
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4374sub tick {
3610 if ($Coro::current != $Coro::main) { 4375 if ($Coro::current != $Coro::main) {
3611 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"
3612 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
3613 return; 4378 return;
3614 } 4379 }
3615 4380
3616 $NOW = $tick_start = EV::now; 4381 cf::one_tick; # one server iteration
3617 4382
3618 cf::server_tick; # one server iteration 4383 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 4384
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $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.;
3625 Coro::async_pool { 4387 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4388 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4389 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4390 or error "ERROR: unable to write runtime file: $!";
3629 }; 4391 };
3630 } 4392 }
3631 4393
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4395 $sig->send;
3634 } 4396 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
3636 $sig->send;
3637 }
3638 4398
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4401
3642 _post_tick; 4402 if (0) {
3643}; 4403 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4404 my $jitter = $TICK_START - $NEXT_TICK;
4405 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4406 debug "jitter $JITTER\n";#d#
4407 }
4408 }
4409}
3645 4410
3646{ 4411{
3647 # configure BDB 4412 # configure BDB
4413 info "initialising database";
3648 4414
3649 BDB::min_parallel 8; 4415 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
3652 4418
3653 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4424 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4425 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4426
3660 cf::sync_job { 4427 cf::sync_job {
3661 eval { 4428 eval {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 }; 4448 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4451 };
4452
4453 info "database initialised";
3685} 4454}
3686 4455
3687{ 4456{
3688 # configure IO::AIO 4457 # configure IO::AIO
3689 4458
4459 info "initialising aio";
3690 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
3693} 4464}
3694 4465
3695my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
3696 4468
3697sub _log_backtrace { 4469sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
3699 4471
3700 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
3701 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4480 ++$_log_backtrace;
4481 my $perl_bt = Carp::longmess $msg;
3705 async { 4482 async {
3706 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
3707 4484
3708 my @bt = fork_call { 4485 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4486 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4497 }
3721 4498
3722 @funcs 4499 @funcs
3723 }; 4500 };
3724 4501
3725 LOG llevInfo, "[ABT] $msg\n"; 4502 LOG llevInfo, "[ABT] $perl_bt\n";
4503 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4505 --$_log_backtrace;
3728 }; 4506 };
3729 } else { 4507 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4510 }
3733} 4511}
3734 4512
3735# load additional modules 4513# load additional modules
3736use cf::pod; 4514require "cf/$_.pm" for @EXTRA_MODULES;
4515cf::_connect_to_perl_2;
3737 4516
3738END { cf::emergency_save } 4517END { cf::emergency_save }
3739 4518
37401 45191
3741 4520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines