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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines