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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines