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.449 by root, Sat Sep 20 00:09:27 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 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
127 153
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
158
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;
132 166
133binmode STDOUT; 167binmode STDOUT;
134binmode STDERR; 168binmode STDERR;
135 169
136# read virtual server time, if available 170# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 172 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
141} 175}
142 176
177eval "sub TICK() { $TICK } 1" or die;
178
143mkdir $_ 179mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 181
146our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
147 183
148sub cf::map::normalise; 184sub cf::map::normalise;
149 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
150############################################################################# 190#############################################################################
151 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
152=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
153 204
154=over 4 205=over 4
155 206
156=item $cf::UPTIME 207=item $cf::UPTIME
157 208
158The 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.
159 225
160=item $cf::RUNTIME 226=item $cf::RUNTIME
161 227
162The 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
163every server tick. 229every server tick.
164 230
165=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
166$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
167$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
168 234
169Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
170directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
172database environment. 238database environment.
173 239
174=item $cf::NOW
175
176The time of the last (current) server tick.
177
178=item $cf::TICK
179
180The interval between server ticks, in seconds.
181
182=item $cf::LOADAVG 240=item $cf::LOADAVG
183 241
184The 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
185(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
186objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
194Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
195from wherever your confdir points to. 253from wherever your confdir points to.
196 254
197=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
198 256
199These 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.
200returns 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
201per 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();
202 278
203=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
204 280
205This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 283that call.
208 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
209=back 291=back
210 292
211=cut 293=cut
212 294
213BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 302 my $msg = join "", @_;
216 303
217 $msg .= "\n" 304 $msg .= "\n"
218 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
219 306
220 $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;
221 308
222 LOG llevError, $msg; 309 LOG llevWarn, $msg;
223 }; 310};
224}
225 311
226$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
228 314
229 if ($Coro::current == $Coro::main) {#d# 315 error Carp::longmess $_[0];
316
317 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 319 return;#d#
232 }#d# 320 }#d#
233 321
234 # kill coroutine otherwise 322 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 323 Coro::terminate
237}; 324};
238
239$SIG{__DIE__} = sub { }; #d#?
240 325
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 329@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 343)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 345}
261 346
262$EV::DIED = sub { 347$EV::DIED = sub {
263 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
264}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
265 355
266############################################################################# 356#############################################################################
267 357
268=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
269 359
290 $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;
291 $d 381 $d
292 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
293} 383}
294 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
295=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
296 438
297Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
298 440
299=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
305our $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
306 448
307sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
497=item cf::post_init { BLOCK }
498
499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
500but I<before> the server starts ticking again.
501
502The codeblock will have a single boolean argument to indicate whether this
503is a reload or not.
504
505=cut
506
507sub post_init(&) {
508 push @POST_INIT, shift;
509}
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
310=item cf::lock_wait $string 528=item cf::lock_wait $string
311 529
312Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
313 531
314=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
315 533
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
319returned. 537returned.
320 538
321Locks 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
322deadlocked coro. 540deadlocked coro.
328 546
329Return 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.
330 548
331=cut 549=cut
332 550
333our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 552
336sub lock_wait($) { 553sub lock_wait($) {
337 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 555}
350 556
351sub lock_acquire($) { 557sub lock_acquire($) {
352 my ($key) = @_; 558 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 559}
366 560
367sub lock_active($) { 561sub lock_active($) {
368 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 563}
372 564
373sub freeze_mainloop { 565sub freeze_mainloop {
374 tick_inhibit_inc; 566 tick_inhibit_inc;
375 567
376 Coro::guard \&tick_inhibit_dec; 568 &Guard::guard (\&tick_inhibit_dec);
377} 569}
378 570
379=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
380 572
381Like 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
382get spread over timer. 574get spread over time.
383 575
384=cut 576=cut
385 577
386sub periodic($$) { 578sub periodic($$) {
387 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
391 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
392} 584}
393 585
394=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
395 587
396Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
397This 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
398of 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.
399 595
400The 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
401used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
402 598
403Useful for short background jobs. 599Useful for short background jobs.
404 600
405=cut 601=cut
406 602
407our @SLOT_QUEUE; 603our @SLOT_QUEUE;
408our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
409 606
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
413 610
414 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
415 613
416 while () { 614 while () {
417 next_job: 615 next_job:
616
617 Coro::cede;
618
418 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 620
420 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 625 $job->[2]->send;
424 Coro::cede;
425 goto next_job; 626 goto next_job;
426 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 629 }
428 } 630 }
429 631
430 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
432 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait;
434 } else { 634 } else {
635 $busy = 0;
435 Coro::schedule; 636 Coro::schedule;
436 } 637 }
437 } 638 }
438}; 639};
439 640
440sub get_slot($;$$) { 641sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
442 643
443 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
444 645
445 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
446 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
447 649
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
462BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
463 665
464=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
465 667
466The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
467is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
468partly 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
469acceptable. 671acceptable.
470 672
471If 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
472the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
476=cut 678=cut
477 679
478sub sync_job(&) { 680sub sync_job(&) {
479 my ($job) = @_; 681 my ($job) = @_;
480 682
481 if ($Coro::current == $Coro::main) { 683 if (in_main) {
482 my $time = EV::time; 684 my $time = AE::time;
483 685
484 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
486 688
487 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
488 690
489 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
490 692
491 my $busy = 1; 693 my $busy = 1;
492 my @res; 694 my @res;
493 695
494 (async { 696 (async {
495 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 698 @res = eval { $job->() };
497 warn $@ if $@; 699 error $@ if $@;
498 undef $busy; 700 undef $busy;
499 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
500 702
501 while ($busy) { 703 while ($busy) {
502 if (Coro::nready) { 704 if (Coro::nready) {
503 Coro::cede_notself; 705 Coro::cede_notself;
504 } else { 706 } else {
505 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
506 } 708 }
507 } 709 }
508 710
509 my $time = EV::time - $time; 711 my $time = AE::time - $time;
510 712
511 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
512 714
513 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
514 } else { 716 } else {
536 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
537 739
538 $coro 740 $coro
539} 741}
540 742
541=item fork_call { }, $args 743=item fork_call { }, @args
542 744
543Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 748never block itself or use any form of event handling.
547 749
548=cut 750=cut
549 751
752sub post_fork {
753 reset_signals;
754}
755
550sub fork_call(&@) { 756sub fork_call(&@) {
551 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
552 758
553 # we seemingly have to make a local copy of the whole thing,
554 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious)
556
557 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
558 reset_signals; 760 cf::post_fork;
559 &$cb 761 &$cb
560 }, @args; 762 } @args;
561 763
562 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 )
563} 776}
564 777
565=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
566 779
567=cut 780=cut
604within each server. 817within each server.
605 818
606=cut 819=cut
607 820
608sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
609 my ($name) = @_; 825 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
611 827
612 eval { 828 eval {
613 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
623} 839}
624 840
625our $DB; 841our $DB;
626 842
627sub db_init { 843sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
630 };
631} 845}
632 846
633sub db_get($$) { 847sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
635 849
636 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
637 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
638 854
639 $! ? () 855 $! ? ()
640 : $data 856 : $data
641 }
642} 857}
643 858
644sub db_put($$$) { 859sub db_put($$$) {
645 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
674 889
675 my @data; 890 my @data;
676 my $md5; 891 my $md5;
677 892
678 for (0 .. $#$src) { 893 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
680 or Carp::croak "$src->[$_]: $!";
681 } 895 }
682 896
683 # if processing is expensive, check 897 # if processing is expensive, check
684 # checksum first 898 # checksum first
685 if (1) { 899 if (1) {
698 912
699 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
700 } 914 }
701 } 915 }
702 916
703 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
704 my $data = $process->(\@data); 918 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
706 920
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 922
709 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
712 926
722 936
723=cut 937=cut
724 938
725sub datalog($@) { 939sub datalog($@) {
726 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 942}
729 943
730=back 944=back
731 945
732=cut 946=cut
927 1141
928 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1144
931 } elsif (ref $type) { 1145 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
933 1147
934 } else { 1148 } else {
935 shift @arg; 1149 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
937 } 1151 }
938 } 1152 }
939} 1153}
940 1154
941sub _object_attach { 1155sub _object_attach {
951 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
952 } 1166 }
953 1167
954 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
955 } else { 1169 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1171 }
958 1172
959 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
960} 1174}
961 1175
1020 1234
1021 for (@$callbacks) { 1235 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1023 1237
1024 if ($@) { 1238 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1240 override;
1028 } 1241 }
1029 1242
1030 return 1 if $override; 1243 return 1 if $override;
1031 } 1244 }
1110 for (@$attach) { 1323 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1113 } 1326 }
1114 } else { 1327 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1329 }
1117 } 1330 }
1118} 1331}
1119 1332
1120cf::attachable->attach ( 1333cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1148 1361
1149 sync_job { 1362 sync_job {
1150 if (length $$rdata) { 1363 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1154 1368
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1376 aio_close $fh;
1160 1377
1161 if (@$objs) { 1378 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1380 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1387 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1389 }
1170 } else { 1390 } else {
1171 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1172 } 1392 }
1173 1393
1174 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1398 } else {
1176 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1177 } 1400 }
1178 } else { 1401 } else {
1179 aio_unlink $filename; 1402 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1181 } 1404 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1429 $av = $st->{objs};
1207 } 1430 }
1208 1431
1209 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1212 1436
1213 ($data, $av) 1437 ($data, $av)
1214} 1438}
1215 1439
1216=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1220=cut 1444=cut
1221 1445
1222############################################################################# 1446#############################################################################
1223# command handling &c 1447# command handling &c
1224 1448
1225=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1226 1450
1227Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1228$name. 1452$name.
1229 1453
1230=cut 1454=cut
1236 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1237 1461
1238 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1239} 1463}
1240 1464
1241=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1242 1466
1243Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1244extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1245received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1246the 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
1247has logged in successfully. 1471has logged in successfully.
1248 1472
1249If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1250called.
1251 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
1252=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1253 1481
1254Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1255exticmd 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
1256are 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
1257is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1258log-in. 1486log-in.
1259 1487
1260If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1261called.
1262 1489
1263=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1264 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
1265sub register_extcmd { 1497sub register_extcmd($$) {
1266 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1267 1499
1268 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1269} 1501}
1270 1502
1271sub register_exticmd { 1503sub register_async_extcmd($$) {
1272 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1273 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1274 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1275} 1513}
1276 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1277cf::player->attach ( 1523cf::player->attach (
1278 on_command => sub { 1524 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1280 1526
1281 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1282 or return; 1528 or return;
1283 1529
1291 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1292 1538
1293 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1294 1540
1295 if (ref $msg) { 1541 if (ref $msg) {
1296 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1297 "ARRAY" eq ref $msg
1298 ? @$msg
1299 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1300 1543
1301 my @reply;
1302
1303 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}) {
1304 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1305 } 1562 }
1306 1563
1307 $pl->ext_reply ($reply, @reply)
1308 if $reply;
1309
1310 } else { 1564 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1566 }
1313 1567
1314 cf::override; 1568 cf::override;
1315 }, 1569 },
1316); 1570);
1317 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
1318sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1319 cf::sync_job { 1601 cf::sync_job {
1320 my %todo; 1602 my %todo;
1321 1603
1322 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1605 next unless -r $path;
1341 1623
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1626
1345 $ext{source} = 1627 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1348 . $source 1630 . $source
1349 . "\n};\n1"; 1631 . "\n};\n1";
1350 1632
1351 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1352 } 1634 }
1353 1635
1636 my $pass = 0;
1354 my %done; 1637 my %done;
1355 while (%todo) { 1638 while (%todo) {
1356 my $progress; 1639 my $progress;
1357 1640
1641 ++$pass;
1642
1643 ext:
1358 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1646 next ext
1361 unless exists $done{$_}; 1647 unless exists $done{$_};
1362 } 1648 }
1363 1649
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1651
1366 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 $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1665
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1667 if exists $v->{meta}{mandatory};
1374 1668
1375 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;
1376 } 1678 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1679 }
1382 1680
1383 skip: 1681 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1691 }
1387 }; 1692 };
1388} 1693}
1389 1694
1390############################################################################# 1695#############################################################################
1444 1749
1445sub exists($) { 1750sub exists($) {
1446 my ($login) = @_; 1751 my ($login) = @_;
1447 1752
1448 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1450} 1755}
1451 1756
1452sub find($) { 1757sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1759 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1475 } 1780 }
1476 } 1781 }
1477} 1782}
1478 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
1479sub save($) { 1797sub save($) {
1480 my ($pl) = @_; 1798 my ($pl) = @_;
1481 1799
1482 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1483 1801
1488 1806
1489 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1491 1809
1492 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];
1493 1814
1494 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1816 cf::cede_to_tick;
1496} 1817}
1497 1818
1531 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1532 1853
1533 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1534 $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
1535 1856
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1858 $pl->deactivate;
1859
1538 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;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1541 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1542 1865
1543 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1599 \@logins 1922 \@logins
1600} 1923}
1601 1924
1602=item $player->maps 1925=item $player->maps
1603 1926
1927=item cf::player::maps $login
1928
1604Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1605player. May block. 1930player. May block.
1606 1931
1607=cut 1932=cut
1608 1933
1629 1954
1630=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1631 1956
1632Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1633 1958
1634=item $player->ext_reply ($msgid, @msg)
1635
1636Sends an ext reply to the player.
1637
1638=cut
1639
1640sub ext_reply($$@) {
1641 my ($self, $id, @msg) = @_;
1642
1643 $self->ns->ext_reply ($id, @msg)
1644}
1645
1646=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1647 1960
1648Sends an ext event to the client. 1961Sends an ext event to the client.
1649 1962
1650=cut 1963=cut
1669 1982
1670=cut 1983=cut
1671 1984
1672sub find_by_path($) { 1985sub find_by_path($) {
1673 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1674 1989
1675 my ($match, $specificity); 1990 my ($match, $specificity);
1676 1991
1677 for my $region (list) { 1992 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1707sub generate_random_map { 2022sub generate_random_map {
1708 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1709 2024
1710 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
1711 2026
1712 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1721 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1722 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1723 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1724 (cf::region::find $rmp->{region}), $rmp->{custom}
1725 )
1726} 2028}
1727 2029
1728=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1729 2031
1730Register 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
1735 2037
1736sub register { 2038sub register {
1737 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 2040 my $pkg = caller;
1739 2041
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 2043
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 2045}
1745 2046
1746# also paths starting with '/' 2047# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 2049
1749sub thawer_merge { 2050sub thawer_merge {
1750 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1751 2052
1752 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1757} 2058}
1758 2059
1759sub normalise { 2060sub normalise {
1760 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1761 2062
1762 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1763 2064
1764 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1765 2066
1766 # map plan: 2067 # map plan:
1767 # 2068 #
1782 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 2084 $path = "$base/$path";
1784 } 2085 }
1785 2086
1786 for ($path) { 2087 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1790 } 2090 }
1791 2091
1792 $path 2092 $path
1806 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1807 return $self; 2107 return $self;
1808 } 2108 }
1809 } 2109 }
1810 2110
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 2112 ()
1813} 2113}
1814 2114
2115# may re-bless or do other evil things
1815sub init { 2116sub init {
1816 my ($self) = @_; 2117 my ($self) = @_;
1817 2118
1818 $self 2119 $self
1819} 2120}
1850 2151
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1853} 2154}
1854 2155
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 2156sub decay_objects {
1865 my ($self) = @_; 2157 my ($self) = @_;
1866 2158
1867 return if $self->{deny_reset}; 2159 return if $self->{deny_reset};
1868 2160
1893 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1894 2186
1895 1 2187 1
1896} 2188}
1897 2189
2190# used to laod the header of an original map
1898sub load_header_orig { 2191sub load_header_orig {
1899 my ($self) = @_; 2192 my ($self) = @_;
1900 2193
1901 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1902} 2195}
1903 2196
2197# used to laod the header of an instantiated map
1904sub load_header_temp { 2198sub load_header_temp {
1905 my ($self) = @_; 2199 my ($self) = @_;
1906 2200
1907 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1908} 2202}
1909 2203
2204# called after loading the header from an instantiated map
1910sub prepare_temp { 2205sub prepare_temp {
1911 my ($self) = @_; 2206 my ($self) = @_;
1912 2207
1913 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1914 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1915 # safety 2210 # safety
1916 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1917 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1918} 2213}
1919 2214
2215# called after loading the header from an original map
1920sub prepare_orig { 2216sub prepare_orig {
1921 my ($self) = @_; 2217 my ($self) = @_;
1922 2218
1923 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1924 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1948 2244
1949sub find; 2245sub find;
1950sub find { 2246sub find {
1951 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1952 2248
2249 cf::cede_to_tick;
2250
1953 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1954 2252
1955 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2255
1958 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
1963 or return; 2258 or return;
1964 2259
1965 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
1966 2261
1978 2273
1979 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
1980 } 2275 }
1981} 2276}
1982 2277
1983sub pre_load { } 2278sub pre_load { }
1984sub post_load { } 2279#sub post_load { } # XS
1985 2280
1986sub load { 2281sub load {
1987 my ($self) = @_; 2282 my ($self) = @_;
1988 2283
1989 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
1992 2287
1993 { 2288 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
1995 2290
1996 return unless $self->valid; 2291 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2293
2001 $self->alloc; 2294 $self->alloc;
2002 2295
2003 $self->pre_load; 2296 $self->pre_load;
2004 cf::cede_to_tick; 2297 cf::cede_to_tick;
2005 2298
2299 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2301 $f->skip_block;
2008 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2009 or return; 2303 or return;
2010 2304
2011 $self->post_load_original 2305 $self->post_load_original
2012 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2013 2307
2014 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2309 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2312 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2021 } 2316 }
2022 } 2317 }
2023 }
2024 2318
2025 $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);
2026 2326
2027 cf::cede_to_tick; 2327 cf::cede_to_tick;
2028 # now do the right thing for maps 2328 # now do the right thing for maps
2029 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2335 $self->decay_objects;
2036 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2037 $self->update_buttons; 2337 $self->update_buttons;
2038 cf::cede_to_tick; 2338 cf::cede_to_tick;
2039 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2040 cf::cede_to_tick;
2041 $self->activate;
2042 } 2340 }
2043 2341
2044 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2344 }
2049 2345
2050 $self->post_load; 2346 $self->post_load;
2051}
2052 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
2053sub customise_for { 2354sub customise_for {
2054 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2055 2356
2056 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2358 if $self->per_player;
2060# if $self->per_party; 2361# if $self->per_party;
2061 2362
2062 $self 2363 $self
2063} 2364}
2064 2365
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2366sub find_sync {
2092 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2093 2368
2094 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
2095} 2374}
2096 2375
2097sub do_load_sync { 2376sub do_load_sync {
2098 my ($map) = @_; 2377 my ($map) = @_;
2099 2378
2379 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2102 2382
2103 cf::sync_job { $map->load }; 2383 $map->load;
2104} 2384}
2105 2385
2106our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2108 2388
2109sub find_async { 2389sub find_async {
2110 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2111 2391
2112 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2113 2393
2114 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2116 } 2396 }
2117 2397
2118 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2119 2399
2120 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2122 2402
2123 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2124 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2125 if (my $map = find $k) { 2405 if (my $map = find $k) {
2126 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2127 } 2407 }
2128 2408
2129 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2130 } 2410 }
2131 } 2411 }
2134 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2135 2415
2136 () 2416 ()
2137} 2417}
2138 2418
2419# common code, used by both ->save and ->swapout
2139sub save { 2420sub _save {
2140 my ($self) = @_; 2421 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2422
2144 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2145 2424
2146 return unless $self->dirty; 2425 return unless $self->dirty;
2147 2426
2167 } else { 2446 } else {
2168 $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);
2169 } 2448 }
2170} 2449}
2171 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2172sub swap_out { 2459sub swap_out {
2173 my ($self) = @_; 2460 my ($self) = @_;
2174 2461
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2180 return if $self->players; 2466 return if $self->players;
2181 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
2182 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2183 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
2184 $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};
2185 2518
2186 $self->deactivate; 2519 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2521 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2522
2234 $self->unlink_save; 2523 $self->unlink_save;
2235 $self->destroy; 2524 $self->destroy;
2236} 2525}
2237 2526
2245 2534
2246 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2247 2536
2248 $self->unlink_save; 2537 $self->unlink_save;
2249 2538
2250 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2544
2312 : normalise $_ 2601 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2603 ]
2315} 2604}
2316 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
2317=back 2638=back
2318 2639
2319=head3 cf::object 2640=head3 cf::object
2320 2641
2321=cut 2642=cut
2344 2665
2345Creates 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.
2346 2667
2347=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2348 2669
2349returns 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,
2350even if the object actually exists. May block. 2671even if the object actually exists. May block.
2351 2672
2352=cut 2673=cut
2353 2674
2354sub deref { 2675sub deref {
2386 2707
2387our $SAY_CHANNEL = { 2708our $SAY_CHANNEL = {
2388 id => "say", 2709 id => "say",
2389 title => "Map", 2710 title => "Map",
2390 reply => "say ", 2711 reply => "say ",
2391 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.",
2392}; 2713};
2393 2714
2394our $CHAT_CHANNEL = { 2715our $CHAT_CHANNEL = {
2395 id => "chat", 2716 id => "chat",
2396 title => "Chat", 2717 title => "Chat",
2436=item $player_object->may ("access") 2757=item $player_object->may ("access")
2437 2758
2438Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2439(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2440 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
2441=cut 2787=cut
2442 2788
2443sub cf::object::player::may { 2789sub cf::object::player::may {
2444 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2445 2791
2446 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2447 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2448 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2449 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2450} 2796}
2451 2797
2452=item $player_object->enter_link 2798=item $player_object->enter_link
2453 2799
2454Freezes 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}>).
2455 2801
2456The 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.
2457for 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,
2458though, 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
2459map. 2805map.
2460 2806
2461Will 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.
2462 2814
2463=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2464 2816
2465Moves 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
2466map. 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
2484sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2485 my ($self) = @_; 2837 my ($self) = @_;
2486 2838
2487 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2488 2840
2841 ++$self->{_link_recursion};
2842
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2844
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2493 2847
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2849}
2496 2850
2497sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2499 2853
2516 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2518 2872
2519 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2522 2876
2523 $map->load; 2877 $map->load;
2524 $map->load_neighbours;
2525 2878
2526 return unless $self->contr->active; 2879 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2880
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2532} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2533 2888
2889}
2890
2534=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)]])
2535 2892
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2903
2547our $GOTOGEN; 2904our $GOTOGEN;
2548 2905
2549sub cf::object::player::goto { 2906sub cf::object::player::goto {
2550 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 }
2551 2914
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2917
2555 $self->enter_link; 2918 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2576 } 2939 }
2577 } 2940 }
2578 2941
2579 my $map = eval { 2942 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2944
2582 if ($map) { 2945 if ($map) {
2583 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2948 } else {
2586 $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);
2587 } 2950 }
2588 2951
2589 $map 2952 $map
2597 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2600 } 2963 }
2601 2964
2602 $done->() if $done; 2965 $done->($self) if $done;
2603 })->prio (1); 2966 })->prio (1);
2604} 2967}
2605 2968
2606=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2607 2970
2675 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2676 3039
2677 unless (eval { 3040 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2679 3042
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2690 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 }
2691 3069
2692 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2693 3071
2694 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "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. "
2702 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2704 3082
2705 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 3084 $self->leave_link;
2707 } 3085 }
2708 })->prio (1); 3086 })->prio (1);
2709} 3087}
2710 3088
2711=head3 cf::client 3089=head3 cf::client
2712 3090
2713=over 4 3091=over 4
2714 3092
2715=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2716 3094
2717Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2718should not be used under normal circumstances. 3096them as required.
2719 3097
2720=cut 3098=cut
2721 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2722sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2723 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2724 3104
2725 utf8::encode $text; 3105 # try lzf for large packets
2726 $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);
2727} 3116}
2728 3117
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3119
2731Send 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
2732client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2733the 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
2734the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2735 3124
2736=cut 3125=cut
2737 3126
2738# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2740 "c/identify" => { 3135 "c/identify" => {
2741 id => "infobox", 3136 id => "infobox",
2742 title => "Identify", 3137 title => "Identify",
2743 reply => undef, 3138 reply => undef,
2744 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2746 "c/examine" => { 3141 "c/examine" => {
2747 id => "infobox", 3142 id => "infobox",
2748 title => "Examine", 3143 title => "Examine",
2749 reply => undef, 3144 reply => undef,
2750 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",
2751 }, 3152 },
2752 "c/book" => { 3153 "c/book" => {
2753 id => "infobox", 3154 id => "infobox",
2754 title => "Book", 3155 title => "Book",
2755 reply => undef, 3156 reply => undef,
2771 id => "infobox", 3172 id => "infobox",
2772 title => "Body Parts", 3173 title => "Body Parts",
2773 reply => undef, 3174 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2775 }, 3176 },
3177 "c/statistics" => {
3178 id => "infobox",
3179 title => "Statistics",
3180 reply => undef,
3181 tooltip => "Shows your primary statistics",
3182 },
3183 "c/skills" => {
3184 id => "infobox",
3185 title => "Skills",
3186 reply => undef,
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",
3212 },
2776 "c/uptime" => { 3213 "c/uptime" => {
2777 id => "infobox", 3214 id => "infobox",
2778 title => "Uptime", 3215 title => "Uptime",
2779 reply => undef, 3216 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2789 id => "party", 3226 id => "party",
2790 title => "Party", 3227 title => "Party",
2791 reply => "gsay ", 3228 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 3229 tooltip => "Messages and chat related to your party",
2793 }, 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,
2794); 3245);
2795 3246
2796sub cf::client::send_msg { 3247sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2798 3249
2803 3254
2804 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2807 3258
2808 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2812 3261
2813 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 3267 }
2820 3268
2821 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2822 } 3270 }
2823 3271
2824 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2825 3273
2826 if ($self->can_msg) {
2827 # default colour, mask it out 3274 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2830 3277
2831 my $pkt = "msg " 3278 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 3279 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 3281 );
2835 3282
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt); 3283 $self->send_big_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 3284}
2873 3285
2874=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2875 3287
2876Sends an ext event to the client. 3288Sends an ext event to the client.
2878=cut 3290=cut
2879 3291
2880sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2881 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2882 3294
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove
2886 push @msg, msgtype => "event_$type";
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 }
2889}
2890
2891=item $client->ext_reply ($msgid, @msg)
2892
2893Sends an ext reply to the client.
2894
2895=cut
2896
2897sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_;
2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 }
2907} 3296}
2908 3297
2909=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2910 3299
2911Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2931 3320
2932 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2933 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2934 3323
2935 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;
2936} 3364}
2937 3365
2938cf::client->attach ( 3366cf::client->attach (
2939 on_connect => sub { 3367 on_connect => sub {
2940 my ($ns) = @_; 3368 my ($ns) = @_;
2966 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2967 3395
2968 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2969 3397
2970 if (ref $msg) { 3398 if (ref $msg) {
2971 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2972 "ARRAY" eq ref $msg
2973 ? @$msg
2974 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2975 3400
2976 my @reply;
2977
2978 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}) {
2979 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2980 } 3419 }
2981
2982 $ns->ext_reply ($reply, @reply)
2983 if $reply;
2984
2985 } else { 3420 } else {
2986 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";
2987 } 3422 }
2988 3423
2989 cf::override; 3424 cf::override;
2990 }, 3425 },
2991); 3426);
3011 3446
3012 $coro 3447 $coro
3013} 3448}
3014 3449
3015cf::client->attach ( 3450cf::client->attach (
3016 on_destroy => sub { 3451 on_client_destroy => sub {
3017 my ($ns) = @_; 3452 my ($ns) = @_;
3018 3453
3019 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3020 }, 3455 },
3021); 3456);
3037our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3038 3473
3039$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3040 3475
3041$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3043 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3044 sort time 3479 sort time
3045)); 3480));
3046 3481
3047# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3051The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3052 3487
3053 cf::object 3488 cf::object
3054 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
3055 insert remove name archname title slaying race decrease split 3490 insert remove name archname title slaying race decrease split
3491 value
3056 3492
3057 cf::object::player 3493 cf::object::player
3058 player 3494 player
3059 3495
3060 cf::player 3496 cf::player
3066=cut 3502=cut
3067 3503
3068for ( 3504for (
3069 ["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
3070 insert remove inv nrof name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3075) { 3511) {
3076 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3079 for @funs; 3514 for @funs;
3080} 3515}
3081 3516
3096 3531
3097 my $qcode = $code; 3532 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3100 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3101 local $_; 3539 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars;
3103 3540
3104 my $eval = 3541 my $eval =
3105 "do {\n" 3542 "do {\n"
3106 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3107 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3108 . $code 3545 . $code
3109 . "\n}" 3546 . "\n}"
3110 ; 3547 ;
3111 3548
3549 if ($CFG{safe_eval}) {
3112 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3113 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3114 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 }
3115 3558
3116 if ($@) { 3559 if ($@) {
3117 warn "$@"; 3560 warn "$@",
3118 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3119 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3120 } 3563 }
3121 3564
3122 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3123} 3566}
3124 3567
3138=cut 3581=cut
3139 3582
3140sub register_script_function { 3583sub register_script_function {
3141 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3142 3585
3143 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3144 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3145} 3588}
3146 3589
3147=back 3590=back
3148 3591
3149=cut 3592=cut
3150 3593
3151############################################################################# 3594#############################################################################
3152# the server's init and main functions 3595# the server's init and main functions
3153 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
3154sub load_facedata($) { 3674sub load_facedata($) {
3155 my ($path) = @_; 3675 my ($path) = @_;
3156 3676
3157 # HACK to clear player env face cache, we need some signal framework
3158 # for this (global event?)
3159 %ext::player_env::MUSIC_FACE_CACHE = ();
3160
3161 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3162 3678
3163 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3164 3680
3165 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3166 0 < aio_load $path, $facedata
3167 or die "$path: $!";
3168
3169 $facedata = Coro::Storable::thaw $facedata;
3170 3682
3171 $facedata->{version} == 2 3683 $facedata->{version} == 2
3172 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3173 3685
3174 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3175 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3176 type => FT_RSRC, 3688
3177 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
3178 }; 3690
3179 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3180 3694
3181 { 3695 {
3182 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3183 3697
3184 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3185 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186 3701
3187 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3189 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};
3190 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};
3191 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3192 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3193 } 3709 }
3194 3710
3195 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3196 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3197 3713
3200 3716
3201 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3202 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3204 } else { 3720 } else {
3205 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3206 } 3722 }
3207
3208 cf::cede_to_tick;
3209 } 3723 }
3210 } 3724 }
3211 3725
3212 { 3726 {
3213 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3214 3728
3215 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3216 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3217 cf::cede_to_tick;
3218 } 3731 }
3219 3732
3220 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3221 } 3734 }
3222 3735
3223 { 3736 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3227 3738
3228 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3229 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
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232 3743
3233 if ($info->{type} & 1) {
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 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;
3248 } else { 3750 } else {
3249 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3250 } 3752 }
3251
3252 cf::cede_to_tick;
3253 } 3753 }
3254 } 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;
3255 3765
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3258 1 3770 1
3259} 3771}
3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280 3772
3281register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3283 3775
3284 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3292 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3294 cf::arch::commit_load; 3786 cf::arch::commit_load;
3295 3787
3296 $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;
3297} 3803}
3298 3804
3299sub reload_regions { 3805sub reload_regions {
3300 # 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
3301 # for this (global event?) 3807 # for this (global event?)
3309 if exists $_->{match}; 3815 if exists $_->{match};
3310 } 3816 }
3311} 3817}
3312 3818
3313sub reload_facedata { 3819sub reload_facedata {
3314 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3315 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3316} 3822}
3317 3823
3318sub reload_archetypes { 3824sub reload_archetypes {
3319 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3320 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;
3321} 3853}
3322 3854
3323sub reload_treasures { 3855sub reload_treasures {
3324 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3325 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3326} 3858}
3327 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
3328sub reload_resources { 3880sub reload_resources {
3329 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3330 3882
3883 reload_materials;
3331 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3332 reload_archetypes; 3887 reload_archetypes;
3333 reload_regions; 3888 reload_regions;
3334 reload_treasures; 3889 reload_treasures;
3335 3890
3336 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3337}
3338
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345} 3892}
3346 3893
3347sub reload_config { 3894sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3349 or return;
3350 3896
3351 local $/; 3897 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3353 3900
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3902
3356 $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};
3357 $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};
3358 3905
3359 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3382 3929
3383 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3384 print $fh $$; 3931 print $fh $$;
3385} 3932}
3386 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
3387sub main { 3943sub main {
3388 atomic; 3944 cf::init_globals; # initialise logging
3945
3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3950
3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3952
3390 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3392 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#
3393 (async { 3956 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3396 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3397 }; 3960 };
3398 3961
3399 { 3962 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3963
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
3975 reload_resources;
3401 reload_config; 3976 reload_config;
3402 db_init; 3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3403 load_extensions; 3986 load_extensions;
3404 3987
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3988 utime time, time, $RUNTIMEFILE;
3409 3989
3410 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3991 use POSIX ();
3411 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};
3412 3993
3413 EV::loop; 3994 cf::_post_init 0;
3995 };
3996
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;
3414} 4005}
3415 4006
3416############################################################################# 4007#############################################################################
3417# initialisation and cleanup 4008# initialisation and cleanup
3418 4009
3419# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3420BEGIN { 4011BEGIN {
3421 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3422 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3423 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3424 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3425 }; 4016 };
3426 } 4017 }
3427} 4018}
3428 4019
3429sub write_runtime_sync { 4020sub write_runtime_sync {
4021 my $t0 = AE::time;
4022
3430 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3432 4025
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 4027
3435 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3436 4029
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 4031 or return;
3439 4032
3440 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3455 or return; 4048 or return;
3456 4049
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 4051 and return;
3459 4052
3460 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 4054
3462 1 4055 1
3463} 4056}
3464 4057
3465our $uuid_lock; 4058our $uuid_lock;
3474 my $uuid = "$LOCALDIR/uuid"; 4067 my $uuid = "$LOCALDIR/uuid";
3475 4068
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 4070 or return;
3478 4071
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
4073
4074 unless ($value) {
4075 info "cowardly refusing to write zero uuid value!\n";
4076 return;
4077 }
4078
4079 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 4080 $uuid_skip = 0;
3481 4081
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 4083 and return;
3484 4084
3490 or return; 4090 or return;
3491 4091
3492 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3493 and return; 4093 and return;
3494 4094
3495 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3496 4096
3497 1 4097 1
3498 4098
3499} 4099}
3500 4100
3506} 4106}
3507 4107
3508sub emergency_save() { 4108sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3510 4110
3511 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;
3512 4117
3513 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3514 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 4127 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 4129 $pl->save;
3523 } 4130 }
3524 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3525 4132
3526 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";
3527 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 4138 $map->valid or next;
3530 $map->save; 4139 $map->save;
3531 } 4140 }
3532 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3533 4142
3534 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";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3537 4148
3538 warn "begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 4150 write_uuid_sync 1;
3540 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
3541 }; 4171 };
3542 4172
3543 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3544} 4174}
3545 4175
3546sub post_cleanup { 4176sub post_cleanup {
3547 my ($make_core) = @_; 4177 my ($make_core) = @_;
3548 4178
4179 IO::AIO::flush;
4180
3549 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 4182 if $make_core;
3551 4183
3552 my $fh = pidfile; 4184 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3554} 4186}
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 4210 }
3579 warn "cleared package #$pkg\n";#d#
3580} 4211}
3581
3582our $RELOAD; # how many times to reload
3583 4212
3584sub do_reload_perl() { 4213sub do_reload_perl() {
3585 # can/must only be called in main 4214 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3587 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3588 return; 4217 return;
3589 } 4218 }
3590 4219
3591 return if $RELOAD++; 4220 return if $RELOAD++;
3592 4221
4222 my $t1 = AE::time;
4223
3593 while ($RELOAD) { 4224 while ($RELOAD) {
3594 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3595 4227
3596 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3597 4229
3598 cf::sync_job { 4230 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 4231 #cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark
3602 4232
3603 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV;
3605
3606 # if anything goes wrong in here, we should simply crash as we already saved
3607
3608 warn "flushing outstanding aio requests";
3609 while (IO::AIO::nreqs || BDB::nreqs) {
3610 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3611 }
3612
3613 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3614 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3615 %EXT_CORO = (); 4235 %EXT_CORO = ();
3616 4236
3617 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3618 %COMMAND = (); 4238 %COMMAND = ();
3619 4239
3620 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3621 %EXTCMD = (); 4241 %EXTCMD = ();
3622 %EXTICMD = (); 4242 %EXTICMD = ();
3623 4243
3624 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3625 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3626 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3627 4247
3628 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3629 eval { 4249 eval {
3630 $cb->($pkg); 4250 $cb->($pkg);
3631 1 4251 1
3632 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3633 } 4253 }
3634 4254
3635 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3636 clear_package $pkg; 4256 clear_package $pkg;
3637 } 4257 }
3638 4258
3639 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642 4262
3643 warn "... unloading $k"; 4263 trace "... unloading $k";
3644 delete $INC{$k}; 4264 delete $INC{$k};
3645 4265
3646 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3648 4268
3651 } 4271 }
3652 4272
3653 clear_package $k; 4273 clear_package $k;
3654 } 4274 }
3655 4275
3656 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3657 clear_package "safe::$_" 4277 clear_package "safe::$_"
3658 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);
3659 4279
3660 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 4283
3664 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3665 # and global variables created in xs 4285 # and global variables created in xs
3666 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3667 4287
3668 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3669 4289
3670 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3671 require cf; 4291 require cf;
3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3673 4293
3674 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3675 cf::reload_config; 4295 cf::reload_config;
3676 4296
3677 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3678 cf::load_extensions; 4298 cf::load_extensions;
3679 4299
4300 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3683 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3686 4308
3687 warn "leaving sync_job"; 4309 cf::_post_init 1;
4310
4311 trace "perl_reload: leaving sync_job";
3688 4312
3689 1 4313 1
3690 } or do { 4314 } or do {
3691 warn $@; 4315 error $@;
3692 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3693 }; 4317 };
3694 4318
3695 warn "reloaded";
3696 --$RELOAD; 4319 --$RELOAD;
3697 } 4320 }
4321
4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3698}; 4324};
3699 4325
3700our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3701 4327
3702sub reload_perl() { 4328sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3705 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 4336 do_reload_perl;
3708 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
4338 };
3709 }; 4339 };
3710} 4340}
3711 4341
3712register_command "reload" => sub { 4342register_command "reload" => sub {
3713 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3719 reload_perl; 4349 reload_perl;
3720 }; 4350 };
3721 } 4351 }
3722}; 4352};
3723 4353
3724unshift @INC, $LIBDIR; 4354#############################################################################
3725 4355
3726my $bug_warning = 0; 4356my $bug_warning = 0;
3727 4357
3728our @WAIT_FOR_TICK;
3729our @WAIT_FOR_TICK_BEGIN;
3730
3731sub wait_for_tick { 4358sub wait_for_tick() {
3732 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3733 4360
3734 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3735 push @WAIT_FOR_TICK, $signal;
3736 $signal->wait;
3737} 4362}
3738 4363
3739sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3741 4366
3742 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3744 $signal->wait; 4369 $signal->wait;
3745} 4370}
3749 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"
3750 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3751 return; 4376 return;
3752 } 4377 }
3753 4378
3754 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#
3755 4382
3756 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3757 $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.;
3758 Coro::async_pool { 4385 Coro::async_pool {
3759 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3760 write_runtime_sync 4387 write_runtime_sync
3761 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3762 }; 4389 };
3763 } 4390 }
3764 4391
3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3766 $sig->send; 4393 $sig->send;
3767 } 4394 }
3768 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3769 $sig->send;
3770 }
3771 4396
3772 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3773 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3774 4399
3775 if (0) { 4400 if (0) {
3776 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3777 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3780 } 4405 }
3781 } 4406 }
3782} 4407}
3783 4408
3784{ 4409{
3785 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3786 4412
3787 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3788 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3789 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3790 4416
3791 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3792 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3794 $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;
3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3820 }; 4446 };
3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3823 }; 4449 };
4450
4451 info "database initialised";
3824} 4452}
3825 4453
3826{ 4454{
3827 # configure IO::AIO 4455 # configure IO::AIO
3828 4456
4457 info "initialising aio";
3829 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3831 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3832} 4462}
3833 4463
3834my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3835 4466
3836sub _log_backtrace { 4467sub _log_backtrace {
3837 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3838 4469
3839 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3840 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3841 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3843 ++$_log_backtrace; 4478 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
3845 async { 4480 async {
3846 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3847 4482
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4503 --$_log_backtrace;
3869 }; 4504 };
3870 } else { 4505 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3873 } 4508 }
3874} 4509}
3875 4510
3876# load additional modules 4511# load additional modules
3877use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3878 4514
3879END { cf::emergency_save } 4515END { cf::emergency_save }
3880 4516
38811 45171
3882 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines