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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines