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